leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: sched: remove tcf_proto from ematch calls

Browse Source 
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>
This commit is contained in:
John Fastabend
2014-10-05 21:27:53 -07:00
committed by David S. Miller
parent fcbeb976d7
commit 82a470f111
10 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/sched/em_ipset.c
View File

@@ -19,12 +19,11 @@
#include <net/ip.h>
#include <net/pkt_cls.h>
static int em_ipset_change(struct tcf_proto *tp, void *data, int data_len,
static int em_ipset_change(struct net *net, void *data, int data_len,
struct tcf_ematch *em)
{
struct xt_set_info *set = data;
ip_set_id_t index;
struct net *net = dev_net(qdisc_dev(tp->q));
if (data_len != sizeof(*set))
return -EINVAL;
@@ -42,11 +41,11 @@ static int em_ipset_change(struct tcf_proto *tp, void *data, int data_len,
return -ENOMEM;
}
static void em_ipset_destroy(struct tcf_proto *p, struct tcf_ematch *em)
static void em_ipset_destroy(struct tcf_ematch *em)
{
const struct xt_set_info *set = (const void *) em->data;
if (set) {
ip_set_nfnl_put(dev_net(qdisc_dev(p->q)), set->index);
ip_set_nfnl_put(em->net, set->index);
kfree((void *) em->data);
}
}