diff options
| author | Benjamin LaHaise <bcrl@kvack.org> | 2013-01-14 06:15:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-14 21:09:36 +0100 |
| commit | c1b52739e45f5969b208ebc377f52468280af11e (patch) | |
| tree | 313ee0c665f27b7d3ea31c8984879930f1de7021 /net/sched/act_police.c | |
| parent | ipv6 netevent: Remove old_neigh from netevent_redirect. (diff) | |
| download | linux-c1b52739e45f5969b208ebc377f52468280af11e.tar.xz linux-c1b52739e45f5969b208ebc377f52468280af11e.zip | |
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_police.c')
| -rw-r--r-- | net/sched/act_police.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index a9de23297d47..8dbd695c160b 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -130,8 +130,9 @@ static const struct nla_policy police_policy[TCA_POLICE_MAX + 1] = { [TCA_POLICE_RESULT] = { .type = NLA_U32 }, }; -static int tcf_act_police_locate(struct nlattr *nla, struct nlattr *est, - struct tc_action *a, int ovr, int bind) +static int tcf_act_police_locate(struct net *net, struct nlattr *nla, + struct nlattr *est, struct tc_action *a, + int ovr, int bind) { unsigned int h; int ret = 0, err; |