aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2019-11-23 18:05:45 +0000
committerYousong Zhou <yszhou4tech@gmail.com>2019-11-23 18:07:14 +0000
commitb3779e920ebaa168eaf18ac1140774c32b6ec6b6 (patch)
treefc6011a55a68c15620d71e8db3da2590b248e200 /target/linux/generic
parent1c5df850a07690451f2878a310c0ea67d0690836 (diff)
downloadupstream-b3779e920ebaa168eaf18ac1140774c32b6ec6b6.tar.gz
upstream-b3779e920ebaa168eaf18ac1140774c32b6ec6b6.tar.bz2
upstream-b3779e920ebaa168eaf18ac1140774c32b6ec6b6.zip
kernel: nf_conntrack_rtcache: fix WARNING on rmmod
Fixes b7c58a1ee ("kernel: nf_conntrack_rtcache: fix cleanup on netns delete and rmmod") Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch4
-rw-r--r--target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch4
2 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
index 37fd203d50..88e5386c1f 100644
--- a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
+++ b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,430 @@
+@@ -0,0 +1,428 @@
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
+
+ unregister_netdevice_notifier(&nf_rtcache_notifier);
+ unregister_pernet_subsys(&rtcache_ops_net_ops);
-+ for_each_net(net)
-+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
+
+ synchronize_net();
+
diff --git a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
index b4ea1bcacb..c02b8f39e0 100644
--- a/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
+++ b/target/linux/generic/backport-4.19/020-backport_netfilter_rtcache.patch
@@ -127,7 +127,7 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,430 @@
+@@ -0,0 +1,428 @@
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
@@ -528,8 +528,6 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
+
+ unregister_netdevice_notifier(&nf_rtcache_notifier);
+ unregister_pernet_subsys(&rtcache_ops_net_ops);
-+ for_each_net(net)
-+ nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
+
+ synchronize_net();
+