aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-03 17:28:30 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-03 17:28:30 -0400
commit5677242f432102dea9e6eceec1dc089e2f709ca4 (patch)
tree73036437b91f2e8cd5427be48a588bff3af587eb /net/dccp/ipv4.c
parenteee4fe4ded6e9c196168aee8f9787771f4df9c90 (diff)
[NETNS]: Inet control socket should not hold a namespace.
This is a generic requirement, so make inet_ctl_sock_create namespace aware and create a inet_ctl_sock_destroy wrapper around sk_release_kernel. 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/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 5669c895c873..b12803bcba56 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1003,7 +1003,7 @@ static int __init dccp_v4_init(void)
1003 inet_register_protosw(&dccp_v4_protosw); 1003 inet_register_protosw(&dccp_v4_protosw);
1004 1004
1005 err = inet_ctl_sock_create(&dccp_v4_ctl_sk, PF_INET, 1005 err = inet_ctl_sock_create(&dccp_v4_ctl_sk, PF_INET,
1006 SOCK_DCCP, IPPROTO_DCCP); 1006 SOCK_DCCP, IPPROTO_DCCP, &init_net);
1007 if (err) 1007 if (err)
1008 goto out_unregister_protosw; 1008 goto out_unregister_protosw;
1009out: 1009out:
@@ -1018,7 +1018,7 @@ out_proto_unregister:
1018 1018
1019static void __exit dccp_v4_exit(void) 1019static void __exit dccp_v4_exit(void)
1020{ 1020{
1021 sock_release(dccp_v4_ctl_sk->sk_socket); 1021 inet_ctl_sock_destroy(dccp_v4_ctl_sk);
1022 inet_unregister_protosw(&dccp_v4_protosw); 1022 inet_unregister_protosw(&dccp_v4_protosw);
1023 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); 1023 inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
1024 proto_unregister(&dccp_v4_prot); 1024 proto_unregister(&dccp_v4_prot);