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_text.c | |
| parent | net: introduce netdevice gso_min_segs attribute (diff) | |
| download | linux-dev-82a470f1119eb7d2e4941b915bf9cd6fd8d54494.tar.xz linux-dev-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/em_text.c')
| -rw-r--r-- | net/sched/em_text.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/em_text.c b/net/sched/em_text.c index 15d353d2e4be..f03c3de16c27 100644 --- a/net/sched/em_text.c +++ b/net/sched/em_text.c @@ -45,7 +45,7 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m, return skb_find_text(skb, from, to, tm->config, &state) != UINT_MAX; } -static int em_text_change(struct tcf_proto *tp, void *data, int len, +static int em_text_change(struct net *net, void *data, int len, struct tcf_ematch *m) { struct text_match *tm; @@ -100,7 +100,7 @@ retry: return 0; } -static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m) +static void em_text_destroy(struct tcf_ematch *m) { if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config) textsearch_destroy(EM_TEXT_PRIV(m)->config); |