Fixes
b7c58a1ee ("kernel: nf_conntrack_rtcache: fix cleanup on netns
delete and rmmod")
Resolves FS#2624
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
-+ 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) {
+ 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);
+ }
+ nf_ct_extend_unregister(&rtcache_extend);
+ unregister_pernet_subsys(&rtcache_ops_net_ops);
+ }
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
# netlink interface for nf_conntrack
--- /dev/null
+++ b/net/netfilter/nf_conntrack_rtcache.c
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
+/* route cache for netfilter.
+ *
+ * (C) 2014 Red Hat GmbH
-+ 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) {
+ 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);
+ }
+ nf_ct_extend_unregister(&rtcache_extend);
+ unregister_pernet_subsys(&rtcache_ops_net_ops);
+ }