diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-18 21:32:58 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-18 21:58:14 +0200 |
| commit | 156c196f6038610770588a708b9e0f7df2ead74a (patch) | |
| tree | 6943a22200b7548ea957ac1305ea9fbed8f6be05 /net/sched | |
| parent | netfilter: nf_tables: kill nft_pktinfo.ops (diff) | |
| download | linux-156c196f6038610770588a708b9e0f7df2ead74a.tar.xz linux-156c196f6038610770588a708b9e0f7df2ead74a.zip | |
netfilter: x_tables: Pass struct net in xt_action_param
As xt_action_param lives on the stack this does not bloat any
persistent data structures.
This is a first step in making netfilter code that needs to know
which network namespace it is executing in simpler.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_ipt.c | 1 | ||||
| -rw-r--r-- | net/sched/em_ipset.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index 99c9cc1c7af9..d05869646515 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -189,6 +189,7 @@ static int tcf_ipt(struct sk_buff *skb, const struct tc_action *a, * worry later - danger - this API seems to have changed * from earlier kernels */ + par.net = dev_net(skb->dev); par.in = skb->dev; par.out = NULL; par.hooknum = ipt->tcfi_hook; diff --git a/net/sched/em_ipset.c b/net/sched/em_ipset.c index df0328ba6a48..c66ca9400ab4 100644 --- a/net/sched/em_ipset.c +++ b/net/sched/em_ipset.c @@ -95,6 +95,7 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em, if (skb->skb_iif) indev = dev_get_by_index_rcu(em->net, skb->skb_iif); + acpar.net = em->net; acpar.in = indev ? indev : dev; acpar.out = dev; |