Commit 8231bd27 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[NETNS][DCCPV6]: 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 68d18598
...@@ -1171,6 +1171,20 @@ static struct inet_protosw dccp_v6_protosw = { ...@@ -1171,6 +1171,20 @@ static struct inet_protosw dccp_v6_protosw = {
.flags = INET_PROTOSW_ICSK, .flags = INET_PROTOSW_ICSK,
}; };
static int dccp_v6_init_net(struct net *net)
{
return 0;
}
static void dccp_v6_exit_net(struct net *net)
{
}
static struct pernet_operations dccp_v6_ops = {
.init = dccp_v6_init_net,
.exit = dccp_v6_exit_net,
};
static int __init dccp_v6_init(void) static int __init dccp_v6_init(void)
{ {
int err = proto_register(&dccp_v6_prot, 1); int err = proto_register(&dccp_v6_prot, 1);
...@@ -1188,8 +1202,15 @@ static int __init dccp_v6_init(void) ...@@ -1188,8 +1202,15 @@ static int __init dccp_v6_init(void)
SOCK_DCCP, IPPROTO_DCCP, &init_net); SOCK_DCCP, IPPROTO_DCCP, &init_net);
if (err != 0) if (err != 0)
goto out_unregister_protosw; goto out_unregister_protosw;
err = register_pernet_subsys(&dccp_v6_ops);
if (err != 0)
goto out_destroy_ctl_sock;
out: out:
return err; return err;
out_destroy_ctl_sock:
inet_ctl_sock_destroy(dccp_v6_ctl_sk);
out_unregister_protosw: out_unregister_protosw:
inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP); inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP);
inet6_unregister_protosw(&dccp_v6_protosw); inet6_unregister_protosw(&dccp_v6_protosw);
...@@ -1200,6 +1221,7 @@ static int __init dccp_v6_init(void) ...@@ -1200,6 +1221,7 @@ static int __init dccp_v6_init(void)
static void __exit dccp_v6_exit(void) static void __exit dccp_v6_exit(void)
{ {
unregister_pernet_subsys(&dccp_v6_ops);
inet_ctl_sock_destroy(dccp_v6_ctl_sk); inet_ctl_sock_destroy(dccp_v6_ctl_sk);
inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP); inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP);
inet6_unregister_protosw(&dccp_v6_protosw); inet6_unregister_protosw(&dccp_v6_protosw);
......
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