From e64cfadd6fbed1a01a7aec6b5165234b06886d3a Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 13 Apr 2008 22:32:02 -0700
Subject: [PATCH] --- yaml --- r: 90663 b: refs/heads/master c:
 8231bd270df435f2d4d85b284dd9dbd48521dd84 h: refs/heads/master i:   90661:
 f8d2982959b6461e6bb47cadba33785af68dc258   90659:
 7fe37ef801679dea71a369308eccf13c6be3d991   90655:
 ca2d9809ad75c4d7ba343cbc78f40e8676e21cb5 v: v3

---
 [refs]                |  2 +-
 trunk/net/dccp/ipv6.c | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 87ffe2e81ac5..776b958788f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68d185980f70413b353df99cdf5e667510036668
+refs/heads/master: 8231bd270df435f2d4d85b284dd9dbd48521dd84
diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c
index b657dea9ee27..2ca52913f4be 100644
--- a/trunk/net/dccp/ipv6.c
+++ b/trunk/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 @@ static int __init dccp_v6_init(void)
 
 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);