aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorYousong Zhou <yszhou4tech@gmail.com>2019-11-23 17:10:09 +0000
committerYousong Zhou <yszhou4tech@gmail.com>2019-11-23 17:30:12 +0000
commit2a2f9ffe81ce689152473633ea7f759f55f2ccb9 (patch)
treeafd0c336e7966407d9c4a899228bca6315f8adec /target/linux/generic
parent15ce616c2de797259cc125f1ece5f2358ea4bd5a (diff)
downloadupstream-2a2f9ffe81ce689152473633ea7f759f55f2ccb9.tar.gz
upstream-2a2f9ffe81ce689152473633ea7f759f55f2ccb9.tar.bz2
upstream-2a2f9ffe81ce689152473633ea7f759f55f2ccb9.zip
kernel: nf_conntrack_rtcache: fix WARNING on forward path
Fixes b7c58a1ee ("kernel: nf_conntrack_rtcache: fix cleanup on netns delete and rmmod") Resolves FS#2624 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> (cherry picked from commit 1c5df850a07690451f2878a310c0ea67d0690836)
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch12
1 files changed, 1 insertions, 11 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 d745a97026..37fd203d50 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,440 @@
+@@ -0,0 +1,430 @@
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
@@ -475,18 +475,8 @@ Signed-off-by: Florian Westphal <fw@strlen.de>
+ return ret;
+ }
+
-+ ret = nf_register_net_hooks(&init_net, rtcache_ops,
-+ ARRAY_SIZE(rtcache_ops));
-+ if (ret < 0) {
-+ nf_ct_extend_unregister(&rtcache_extend);
-+ unregister_pernet_subsys(&rtcache_ops_net_ops);
-+ return ret;
-+ }
-+
+ ret = register_netdevice_notifier(&nf_rtcache_notifier);
+ if (ret) {
-+ nf_unregister_net_hooks(&init_net, rtcache_ops,
-+ ARRAY_SIZE(rtcache_ops));
+ nf_ct_extend_unregister(&rtcache_extend);
+ unregister_pernet_subsys(&rtcache_ops_net_ops);
+ }