Commit 03eb7d49 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: ipt_CLUSTERIP: switch to nf_register_net_hook

one of the last remaining users of the old api, hopefully followup commit
can remove it soon.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 04b80cea
...@@ -743,14 +743,20 @@ static const struct file_operations clusterip_proc_fops = { ...@@ -743,14 +743,20 @@ static const struct file_operations clusterip_proc_fops = {
static int clusterip_net_init(struct net *net) static int clusterip_net_init(struct net *net)
{ {
struct clusterip_net *cn = net_generic(net, clusterip_net_id); struct clusterip_net *cn = net_generic(net, clusterip_net_id);
int ret;
INIT_LIST_HEAD(&cn->configs); INIT_LIST_HEAD(&cn->configs);
spin_lock_init(&cn->lock); spin_lock_init(&cn->lock);
ret = nf_register_net_hook(net, &cip_arp_ops);
if (ret < 0)
return ret;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net); cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
if (!cn->procdir) { if (!cn->procdir) {
nf_unregister_net_hook(net, &cip_arp_ops);
pr_err("Unable to proc dir entry\n"); pr_err("Unable to proc dir entry\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -765,6 +771,7 @@ static void clusterip_net_exit(struct net *net) ...@@ -765,6 +771,7 @@ static void clusterip_net_exit(struct net *net)
struct clusterip_net *cn = net_generic(net, clusterip_net_id); struct clusterip_net *cn = net_generic(net, clusterip_net_id);
proc_remove(cn->procdir); proc_remove(cn->procdir);
#endif #endif
nf_unregister_net_hook(net, &cip_arp_ops);
} }
static struct pernet_operations clusterip_net_ops = { static struct pernet_operations clusterip_net_ops = {
...@@ -786,17 +793,11 @@ static int __init clusterip_tg_init(void) ...@@ -786,17 +793,11 @@ static int __init clusterip_tg_init(void)
if (ret < 0) if (ret < 0)
goto cleanup_subsys; goto cleanup_subsys;
ret = nf_register_hook(&cip_arp_ops);
if (ret < 0)
goto cleanup_target;
pr_info("ClusterIP Version %s loaded successfully\n", pr_info("ClusterIP Version %s loaded successfully\n",
CLUSTERIP_VERSION); CLUSTERIP_VERSION);
return 0; return 0;
cleanup_target:
xt_unregister_target(&clusterip_tg_reg);
cleanup_subsys: cleanup_subsys:
unregister_pernet_subsys(&clusterip_net_ops); unregister_pernet_subsys(&clusterip_net_ops);
return ret; return ret;
...@@ -806,7 +807,6 @@ static void __exit clusterip_tg_exit(void) ...@@ -806,7 +807,6 @@ static void __exit clusterip_tg_exit(void)
{ {
pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION); pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION);
nf_unregister_hook(&cip_arp_ops);
xt_unregister_target(&clusterip_tg_reg); xt_unregister_target(&clusterip_tg_reg);
unregister_pernet_subsys(&clusterip_net_ops); unregister_pernet_subsys(&clusterip_net_ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment