diff options
| author | Hans Schillstrom | 2012-04-26 07:47:44 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2012-04-30 10:40:35 +0200 |
| commit | 8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0 (patch) | |
| tree | 7a57ad6ef5aa0147dd13bba8be9bd77ab60f3f50 /net/netfilter/ipvs/ip_vs_core.c | |
| parent | ipvs: take care of return value from protocol init_netns (diff) | |
| download | kernel-qcow2-linux-8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0.tar.gz kernel-qcow2-linux-8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0.tar.xz kernel-qcow2-linux-8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0.zip | |
ipvs: kernel oops - do_ip_vs_get_ctl
Change order of init so netns init is ready
when register ioctl and netlink.
Ver2
Whitespace fixes and __init added.
Reported-by: "Ryan O'Hara" <rohara@redhat.com>
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_core.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 260b9ef88775..00bdb1d9d690 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -1995,10 +1995,18 @@ static int __init ip_vs_init(void) goto cleanup_dev; } + ret = ip_vs_register_nl_ioctl(); + if (ret < 0) { + pr_err("can't register netlink/ioctl.\n"); + goto cleanup_hooks; + } + pr_info("ipvs loaded.\n"); return ret; +cleanup_hooks: + nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops)); cleanup_dev: unregister_pernet_device(&ipvs_core_dev_ops); cleanup_sub: @@ -2014,6 +2022,7 @@ exit: static void __exit ip_vs_cleanup(void) { + ip_vs_unregister_nl_ioctl(); nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops)); unregister_pernet_device(&ipvs_core_dev_ops); unregister_pernet_subsys(&ipvs_core_ops); /* free ip_vs struct */ |