diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-03 14:31:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 14:31:03 -0700 |
| commit | 1ed8516f09e510e4595bc900ad9266c15aacfdd2 (patch) | |
| tree | e41fa4151f3b13031291dae5b3ef5a83b3de23d8 /net/ipv6/ndisc.c | |
| parent | 5616bdd6dfeb4e36be499dbac245e4d3be90a138 (diff) | |
| download | blackbird-obmc-linux-1ed8516f09e510e4595bc900ad9266c15aacfdd2.tar.gz blackbird-obmc-linux-1ed8516f09e510e4595bc900ad9266c15aacfdd2.zip | |
[IPV6]: Simplify IPv6 control sockets creation.
Do this by replacing sock_create_kern with inet_ctl_sock_create.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 510aa747a404..06d80c6dc5ce 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -84,6 +84,7 @@ #include <net/flow.h> #include <net/ip6_checksum.h> +#include <net/inet_common.h> #include <linux/proc_fs.h> #include <linux/netfilter.h> @@ -1731,12 +1732,12 @@ static int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name, static int ndisc_net_init(struct net *net) { - struct socket *sock; struct ipv6_pinfo *np; struct sock *sk; int err; - err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6, &sock); + err = inet_ctl_sock_create(&sk, PF_INET6, + SOCK_RAW, IPPROTO_ICMPV6, net); if (err < 0) { ND_PRINTK0(KERN_ERR "ICMPv6 NDISC: Failed to initialize the control socket (err %d).\n", @@ -1744,22 +1745,19 @@ static int ndisc_net_init(struct net *net) return err; } - net->ipv6.ndisc_sk = sk = sock->sk; - sk_change_net(sk, net); + net->ipv6.ndisc_sk = sk; np = inet6_sk(sk); - sk->sk_allocation = GFP_ATOMIC; np->hop_limit = 255; /* Do not loopback ndisc messages */ np->mc_loop = 0; - sk->sk_prot->unhash(sk); return 0; } static void ndisc_net_exit(struct net *net) { - sk_release_kernel(net->ipv6.ndisc_sk); + inet_ctl_sock_destroy(net->ipv6.ndisc_sk); } static struct pernet_operations ndisc_net_ops = { |
