aboutsummaryrefslogtreecommitdiffstats
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:08:12 +0000
commit7c321e00dd194d0232adbfab1843646a07c6159f (patch)
tree5f1ad1a4f44353948fdc1259b8d87522d4ab6a90
parent2a2f9ffe81ce689152473633ea7f759f55f2ccb9 (diff)
downloadupstream-7c321e00dd194d0232adbfab1843646a07c6159f.tar.gz
upstream-7c321e00dd194d0232adbfab1843646a07c6159f.tar.bz2
upstream-7c321e00dd194d0232adbfab1843646a07c6159f.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> (cherry picked from commit b3779e920ebaa168eaf18ac1140774c32b6ec6b6)
-rw-r--r--target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch4
1 files changed, 1 insertions, 3 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();
+