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)

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 d745a970269061c56ef92677db0e85e96207f58b..37fd203d507357ad1fc6e647e07d48a3a7134b62 100644 (file)
--- 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);
 +      }