From af67fc1cc0b4171a23ea38a73d8828b73427cbe2 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Sun, 24 Nov 2019 01:40:12 -0800 Subject: [PATCH] kernel: nf_conntrack_rtcache: fix WARNING on rmmod --- .../backport-4.14/020-backport_netfilter_rtcache.patch | 4 +--- .../backport-4.19/020-backport_netfilter_rtcache.patch | 4 +--- 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 37fd203d5..88e5386c1 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 # 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 + + 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 b4ea1bcac..c02b8f39e 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 # 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 + + 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(); +