diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-12 20:41:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-12 20:41:02 -0700 |
| commit | 63428fb6a134947d9efad721dc80e721b328a4e4 (patch) | |
| tree | 020f13f2d700eeb85998258429a05d119d689937 /include/net/act_api.h | |
| parent | da8ab57863ed7e912d10b179b6bdc652f635bd19 (diff) | |
| parent | 1697c4bb5245649a23f06a144cc38c06715e1b65 (diff) | |
Merge branch 'net_sched-fix-filter-chain-reference-counting'
Cong Wang says:
====================
net_sched: fix filter chain reference counting
This patchset fixes tc filter chain reference counting and nasty race
conditions with RCU callbacks. Please see each patch for details.
v3: Rebase on the latest -net
Add code comment in patch 1
Improve comment and changelog for patch 2
Add patch 3
v2: Add patch 1
Get rid of more ugly code in patch 2
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/act_api.h')
| -rw-r--r-- | include/net/act_api.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index 8f3d5d8b5ae0..b944e0eb93be 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -34,7 +34,6 @@ struct tc_action { struct gnet_stats_queue tcfa_qstats; struct net_rate_estimator __rcu *tcfa_rate_est; spinlock_t tcfa_lock; - struct rcu_head tcfa_rcu; struct gnet_stats_basic_cpu __percpu *cpu_bstats; struct gnet_stats_queue __percpu *cpu_qstats; struct tc_cookie *act_cookie; @@ -50,7 +49,6 @@ struct tc_action { #define tcf_qstats common.tcfa_qstats #define tcf_rate_est common.tcfa_rate_est #define tcf_lock common.tcfa_lock -#define tcf_rcu common.tcfa_rcu /* Update lastuse only if needed, to avoid dirtying a cache line. * We use a temp variable to avoid fetching jiffies twice. |