From: Pablo Neira Ayuso <pa...@netfilter.org>

This target is deprecated, but let's adapt this so it doesn't break existing
users.

Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
Signed-off-by: Eric W Biederman <ebied...@xmission.com>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c 
b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index abbf0c0052af..d0d2f2b00f2d 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -724,6 +724,7 @@ static const struct file_operations clusterip_proc_fops = {
 static int clusterip_net_init(struct net *net)
 {
        struct clusterip_net *cn = net_generic(net, clusterip_net_id);
+       int ret;
 
        INIT_LIST_HEAD(&cn->configs);
 
@@ -737,6 +738,11 @@ static int clusterip_net_init(struct net *net)
        }
 #endif /* CONFIG_PROC_FS */
 
+       ret = nf_register_hook(net, &cip_arp_ops);
+       if (ret < 0) {
+               proc_remove(cn->procdir);
+               return ret;
+       }
        return 0;
 }
 
@@ -746,6 +752,7 @@ static void clusterip_net_exit(struct net *net)
        struct clusterip_net *cn = net_generic(net, clusterip_net_id);
        proc_remove(cn->procdir);
 #endif
+       nf_unregister_hook(net, &cip_arp_ops);
 }
 
 static struct pernet_operations clusterip_net_ops = {
@@ -767,17 +774,11 @@ static int __init clusterip_tg_init(void)
        if (ret < 0)
                goto cleanup_subsys;
 
-       ret = nf_register_hook(&init_net, &cip_arp_ops);
-       if (ret < 0)
-               goto cleanup_target;
-
        pr_info("ClusterIP Version %s loaded successfully\n",
                CLUSTERIP_VERSION);
 
        return 0;
 
-cleanup_target:
-       xt_unregister_target(&clusterip_tg_reg);
 cleanup_subsys:
        unregister_pernet_subsys(&clusterip_net_ops);
        return ret;
@@ -787,7 +788,6 @@ static void __exit clusterip_tg_exit(void)
 {
        pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION);
 
-       nf_unregister_hook(&init_net, &cip_arp_ops);
        xt_unregister_target(&clusterip_tg_reg);
        unregister_pernet_subsys(&clusterip_net_ops);
 
-- 
2.2.1

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to