diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-13 22:32:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-13 22:32:02 -0700 |
| commit | 8231bd270df435f2d4d85b284dd9dbd48521dd84 (patch) | |
| tree | 910c5d067af572ae28809df7ed7501b10c399d57 | |
| parent | 68d185980f70413b353df99cdf5e667510036668 (diff) | |
| download | op-kernel-dev-8231bd270df435f2d4d85b284dd9dbd48521dd84.zip op-kernel-dev-8231bd270df435f2d4d85b284dd9dbd48521dd84.tar.gz | |
[NETNS][DCCPV6]: Add dummy per-net operations.
They will be responsible for ctl socket initialization, but
currently they are void.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dccp/ipv6.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index b657dea..2ca5291 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -1171,6 +1171,20 @@ static struct inet_protosw dccp_v6_protosw = { .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) { int err = proto_register(&dccp_v6_prot, 1); @@ -1188,8 +1202,15 @@ static int __init dccp_v6_init(void) SOCK_DCCP, IPPROTO_DCCP, &init_net); if (err != 0) goto out_unregister_protosw; + + err = register_pernet_subsys(&dccp_v6_ops); + if (err != 0) + goto out_destroy_ctl_sock; out: return err; + +out_destroy_ctl_sock: + inet_ctl_sock_destroy(dccp_v6_ctl_sk); out_unregister_protosw: inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP); inet6_unregister_protosw(&dccp_v6_protosw); @@ -1200,6 +1221,7 @@ out_unregister_proto: static void __exit dccp_v6_exit(void) { + unregister_pernet_subsys(&dccp_v6_ops); inet_ctl_sock_destroy(dccp_v6_ctl_sk); inet6_del_protocol(&dccp_v6_protocol, IPPROTO_DCCP); inet6_unregister_protosw(&dccp_v6_protosw); |
