From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 24 Mar 2008 21:56:57 +0000 (-0700)
Subject: [NETNS][UDP-Lite]: Register /proc/net/udplite(6) in a namespace.
X-Git-Tag: v2.6.26-rc1~1138^2~373
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84c375af0ff61e0bd15fac0aed0438640494483e;p=linux-2.6-omap-h63xx.git

[NETNS][UDP-Lite]: Register /proc/net/udplite(6) in a namespace.

UDP-Lite sockets are displayed in another files, rather than
UDP ones, so make the present in namespaces as well.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 653a6fc1902..ddf4cc43279 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -83,9 +83,24 @@ static struct udp_seq_afinfo udplite4_seq_afinfo = {
 	.seq_fops	= &udplite4_seq_fops,
 };
 
+static int udplite4_proc_init_net(struct net *net)
+{
+	return udp_proc_register(net, &udplite4_seq_afinfo);
+}
+
+static void udplite4_proc_exit_net(struct net *net)
+{
+	udp_proc_unregister(net, &udplite4_seq_afinfo);
+}
+
+static struct pernet_operations udplite4_net_ops = {
+	.init = udplite4_proc_init_net,
+	.exit = udplite4_proc_exit_net,
+};
+
 static __init int udplite4_proc_init(void)
 {
-	return udp_proc_register(&init_net, &udplite4_seq_afinfo);
+	return register_pernet_subsys(&udplite4_net_ops);
 }
 #else
 static inline int udplite4_proc_init(void)
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 93e52e0d57f..706c5c375a0 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -109,13 +109,28 @@ static struct udp_seq_afinfo udplite6_seq_afinfo = {
 	.seq_fops	= &udplite6_seq_fops,
 };
 
+static int udplite6_proc_init_net(struct net *net)
+{
+	return udp_proc_register(net, &udplite6_seq_afinfo);
+}
+
+static void udplite6_proc_exit_net(struct net *net)
+{
+	udp_proc_unregister(net, &udplite6_seq_afinfo);
+}
+
+static struct pernet_operations udplite6_net_ops = {
+	.init = udplite6_proc_init_net,
+	.exit = udplite6_proc_exit_net,
+};
+
 int __init udplite6_proc_init(void)
 {
-	return udp_proc_register(&init_net, &udplite6_seq_afinfo);
+	return register_pernet_subsys(&udplite6_net_ops);
 }
 
 void udplite6_proc_exit(void)
 {
-	udp_proc_unregister(&init_net, &udplite6_seq_afinfo);
+	unregister_pernet_subsys(&udplite6_net_ops);
 }
 #endif