diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2017-11-06 22:47:18 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-09 02:03:09 +0100 |
commit | c7e460ce55724d4e4e22d3126e5c47273819c53a (patch) | |
tree | ad2918c2f935998144a787fd643d06e16e5a56a2 /net/sched/act_ipt.c | |
parent | net: usb: asix: fill null-ptr-deref in asix_suspend (diff) | |
download | linux-c7e460ce55724d4e4e22d3126e5c47273819c53a.tar.xz linux-c7e460ce55724d4e4e22d3126e5c47273819c53a.zip |
Revert "net_sched: hold netns refcnt for each action"
This reverts commit ceffcc5e254b450e6159f173e4538215cebf1b59.
If we hold that refcnt, the netns can never be destroyed until
all actions are destroyed by user, this breaks our netns design
which we expect all actions are destroyed when we destroy the
whole netns.
Cc: Lucas Bates <lucasb@mojatatu.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_ipt.c')
-rw-r--r-- | net/sched/act_ipt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c index dbdf3b2470d5..d9e399a7e3d5 100644 --- a/net/sched/act_ipt.c +++ b/net/sched/act_ipt.c @@ -334,7 +334,7 @@ static __net_init int ipt_init_net(struct net *net) { struct tc_action_net *tn = net_generic(net, ipt_net_id); - return tc_action_net_init(tn, &act_ipt_ops, net); + return tc_action_net_init(tn, &act_ipt_ops); } static void __net_exit ipt_exit_net(struct net *net) @@ -384,7 +384,7 @@ static __net_init int xt_init_net(struct net *net) { struct tc_action_net *tn = net_generic(net, xt_net_id); - return tc_action_net_init(tn, &act_xt_ops, net); + return tc_action_net_init(tn, &act_xt_ops); } static void __net_exit xt_exit_net(struct net *net) |