diff options
| author | Benjamin LaHaise <bcrl@kvack.org> | 2013-01-14 05:15:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-14 15:09:36 -0500 |
| commit | c1b52739e45f5969b208ebc377f52468280af11e (patch) | |
| tree | 313ee0c665f27b7d3ea31c8984879930f1de7021 /net/sched/act_pedit.c | |
| parent | 605928337866c6369ae60509fa2b10af325a25eb (diff) | |
| download | op-kernel-dev-c1b52739e45f5969b208ebc377f52468280af11e.zip op-kernel-dev-c1b52739e45f5969b208ebc377f52468280af11e.tar.gz | |
pkt_sched: namespace aware act_mirred
Eric Dumazet pointed out that act_mirred needs to find the current net_ns,
and struct net pointer is not provided in the call chain. His original
patch made use of current->nsproxy->net_ns to find the network namespace,
but this fails to work correctly for userspace code that makes use of
netlink sockets in different network namespaces. Instead, pass the
"struct net *" down along the call chain to where it is needed.
This version removes the ifb changes as Eric has submitted that patch
separately, but is otherwise identical to the previous version.
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Tested-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_pedit.c')
| -rw-r--r-- | net/sched/act_pedit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 45c53ab..0c3fadd 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c @@ -38,8 +38,9 @@ static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = { [TCA_PEDIT_PARMS] = { .len = sizeof(struct tc_pedit) }, }; -static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est, - struct tc_action *a, int ovr, int bind) +static int tcf_pedit_init(struct net *net, struct nlattr *nla, + struct nlattr *est, struct tc_action *a, + int ovr, int bind) { struct nlattr *tb[TCA_PEDIT_MAX + 1]; struct tc_pedit *parm; |
