diff options
author | John Fastabend <john.fastabend@gmail.com> | 2014-10-05 21:27:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-06 18:02:32 -0400 |
commit | 82a470f1119eb7d2e4941b915bf9cd6fd8d54494 (patch) | |
tree | d16362829e33070f8367876205659fbf271ecfc2 /net/sched/cls_cgroup.c | |
parent | fcbeb976d7ce783fd58e63e61c196d9a8912b3be (diff) | |
download | linux-stable-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.tar.gz linux-stable-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.tar.bz2 linux-stable-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.zip |
net: sched: remove tcf_proto from ematch calls
This removes the tcf_proto argument from the ematch code paths that
only need it to reference the net namespace. This allows simplifying
qdisc code paths especially when we need to tear down the ematch
from an RCU callback. In this case we can not guarentee that the
tcf_proto structure is still valid.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_cgroup.c')
-rw-r--r-- | net/sched/cls_cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 3409f168225f..2f77a89655dc 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -87,7 +87,7 @@ static void cls_cgroup_destroy_rcu(struct rcu_head *root) rcu); tcf_exts_destroy(&head->exts); - tcf_em_tree_destroy(head->tp, &head->ematches); + tcf_em_tree_destroy(&head->ematches); kfree(head); } @@ -157,7 +157,7 @@ static void cls_cgroup_destroy(struct tcf_proto *tp) if (head) { tcf_exts_destroy(&head->exts); - tcf_em_tree_destroy(tp, &head->ematches); + tcf_em_tree_destroy(&head->ematches); RCU_INIT_POINTER(tp->root, NULL); kfree_rcu(head, rcu); } |