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/em_meta.c | |
| parent | fcbeb976d7ce783fd58e63e61c196d9a8912b3be (diff) | |
| download | linux-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.tar.bz2 | |
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/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 9b8c0b0e60d7..c8f8c399b99a 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c @@ -856,7 +856,7 @@ static const struct nla_policy meta_policy[TCA_EM_META_MAX + 1] = { [TCA_EM_META_HDR] = { .len = sizeof(struct tcf_meta_hdr) }, }; -static int em_meta_change(struct tcf_proto *tp, void *data, int len, +static int em_meta_change(struct net *net, void *data, int len, struct tcf_ematch *m) { int err; @@ -908,7 +908,7 @@ errout: return err; } -static void em_meta_destroy(struct tcf_proto *tp, struct tcf_ematch *m) +static void em_meta_destroy(struct tcf_ematch *m) { if (m) meta_delete((struct meta_match *) m->data); |