]> Pileus Git - ~andy/linux/commit
pkt_sched: namespace aware act_mirred
authorBenjamin LaHaise <bcrl@kvack.org>
Mon, 14 Jan 2013 05:15:39 +0000 (05:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Jan 2013 20:09:36 +0000 (15:09 -0500)
commitc1b52739e45f5969b208ebc377f52468280af11e
tree313ee0c665f27b7d3ea31c8984879930f1de7021
parent605928337866c6369ae60509fa2b10af325a25eb
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>
22 files changed:
include/net/act_api.h
include/net/pkt_cls.h
include/net/sch_generic.h
net/sched/act_api.c
net/sched/act_csum.c
net/sched/act_gact.c
net/sched/act_ipt.c
net/sched/act_mirred.c
net/sched/act_nat.c
net/sched/act_pedit.c
net/sched/act_police.c
net/sched/act_simple.c
net/sched/act_skbedit.c
net/sched/cls_api.c
net/sched/cls_basic.c
net/sched/cls_cgroup.c
net/sched/cls_flow.c
net/sched/cls_fw.c
net/sched/cls_route.c
net/sched/cls_rsvp.h
net/sched/cls_tcindex.c
net/sched/cls_u32.c