Commit 72a2d613 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[NETNS][DCCPV4]: Add dummy per-net operations.

They will be responsible for ctl socket initialization, but
currently they are void.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67019cc9
...@@ -989,6 +989,20 @@ static struct inet_protosw dccp_v4_protosw = { ...@@ -989,6 +989,20 @@ static struct inet_protosw dccp_v4_protosw = {
.flags = INET_PROTOSW_ICSK, .flags = INET_PROTOSW_ICSK,
}; };
static int dccp_v4_init_net(struct net *net)
{
return 0;
}
static void dccp_v4_exit_net(struct net *net)
{
}
static struct pernet_operations dccp_v4_ops = {
.init = dccp_v4_init_net,
.exit = dccp_v4_exit_net,
};
static int __init dccp_v4_init(void) static int __init dccp_v4_init(void)
{ {
int err = proto_register(&dccp_v4_prot, 1); int err = proto_register(&dccp_v4_prot, 1);
...@@ -1006,8 +1020,14 @@ static int __init dccp_v4_init(void) ...@@ -1006,8 +1020,14 @@ static int __init dccp_v4_init(void)
SOCK_DCCP, IPPROTO_DCCP, &init_net); SOCK_DCCP, IPPROTO_DCCP, &init_net);
if (err) if (err)
goto out_unregister_protosw; goto out_unregister_protosw;
err = register_pernet_subsys(&dccp_v4_ops);
if (err)
goto out_destroy_ctl_sock;
out: out:
return err; return err;
out_destroy_ctl_sock:
inet_ctl_sock_destroy(dccp_v4_ctl_sk);
out_unregister_protosw: out_unregister_protosw:
inet_unregister_protosw(&dccp_v4_protosw); inet_unregister_protosw(&dccp_v4_protosw);
inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
...@@ -1018,6 +1038,7 @@ static int __init dccp_v4_init(void) ...@@ -1018,6 +1038,7 @@ static int __init dccp_v4_init(void)
static void __exit dccp_v4_exit(void) static void __exit dccp_v4_exit(void)
{ {
unregister_pernet_subsys(&dccp_v4_ops);
inet_ctl_sock_destroy(dccp_v4_ctl_sk); inet_ctl_sock_destroy(dccp_v4_ctl_sk);
inet_unregister_protosw(&dccp_v4_protosw); inet_unregister_protosw(&dccp_v4_protosw);
inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP); inet_del_protocol(&dccp_v4_protocol, IPPROTO_DCCP);
......
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