diff options
| author | John Fastabend <john.fastabend@gmail.com> | 2014-10-06 04:27:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-06 22:02:32 (GMT) |
| commit | 82a470f1119eb7d2e4941b915bf9cd6fd8d54494 (patch) | |
| tree | d16362829e33070f8367876205659fbf271ecfc2 /net/sched/cls_flow.c | |
| parent | fcbeb976d7ce783fd58e63e61c196d9a8912b3be (diff) | |
| download | linux-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.tar.xz | |
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_flow.c')
| -rw-r--r-- | net/sched/cls_flow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index f18d27f7..a5d2b20 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c @@ -355,7 +355,7 @@ static void flow_destroy_filter(struct rcu_head *head) del_timer_sync(&f->perturb_timer); tcf_exts_destroy(&f->exts); - tcf_em_tree_destroy(f->tp, &f->ematches); + tcf_em_tree_destroy(&f->ematches); kfree(f); } @@ -530,7 +530,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, return 0; err2: - tcf_em_tree_destroy(tp, &t); + tcf_em_tree_destroy(&t); kfree(fnew); err1: tcf_exts_destroy(&e); |