Commit b3779e92 authored by Yousong Zhou's avatar Yousong Zhou
Browse files

kernel: nf_conntrack_rtcache: fix WARNING on rmmod

Fixes b7c58a1e

 ("kernel: nf_conntrack_rtcache: fix cleanup on netns
delete and rmmod")
Signed-off-by: default avatarYousong Zhou <yszhou4tech@gmail.com>
parent 1c5df850
...@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de> ...@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
# netlink interface for nf_conntrack # netlink interface for nf_conntrack
--- /dev/null --- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c +++ b/net/netfilter/nf_conntrack_rtcache.c
@@ -0,0 +1,430 @@ @@ -0,0 +1,428 @@
+/* route cache for netfilter. +/* route cache for netfilter.
+ * + *
+ * (C) 2014 Red Hat GmbH + * (C) 2014 Red Hat GmbH
...@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de> ...@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
+ +
+ unregister_netdevice_notifier(&nf_rtcache_notifier); + unregister_netdevice_notifier(&nf_rtcache_notifier);
+ unregister_pernet_subsys(&rtcache_ops_net_ops); + unregister_pernet_subsys(&rtcache_ops_net_ops);
+ for_each_net(net)
+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
+ +
+ synchronize_net(); + synchronize_net();
+ +
......
...@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de> ...@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
# netlink interface for nf_conntrack # netlink interface for nf_conntrack
--- /dev/null --- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c +++ b/net/netfilter/nf_conntrack_rtcache.c
@@ -0,0 +1,430 @@ @@ -0,0 +1,428 @@
+/* route cache for netfilter. +/* route cache for netfilter.
+ * + *
+ * (C) 2014 Red Hat GmbH + * (C) 2014 Red Hat GmbH
...@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de> ...@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
+ +
+ unregister_netdevice_notifier(&nf_rtcache_notifier); + unregister_netdevice_notifier(&nf_rtcache_notifier);
+ unregister_pernet_subsys(&rtcache_ops_net_ops); + unregister_pernet_subsys(&rtcache_ops_net_ops);
+ for_each_net(net)
+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
+ +
+ synchronize_net(); + synchronize_net();
+ +
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment