X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fipv6%2Fproc.c;h=8a5be290c7103e44183c37fb39edca3deb07abdd;hb=061964fb988ca51087948975da66ff523b3a5852;hp=35e502a72495f97efc72c7f386e25ca9d53f95e0;hpb=7924e4f6519dd5b349ed146fe9fe35206730be67;p=linux-2.6

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 35e502a724..8a5be290c7 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -214,15 +214,18 @@ int snmp6_register_dev(struct inet6_dev *idev)
 	if (!idev || !idev->dev)
 		return -EINVAL;
 
+	if (idev->dev->nd_net != &init_net)
+		return 0;
+
 	if (!proc_net_devsnmp6)
 		return -ENOENT;
 
-	p = create_proc_entry(idev->dev->name, S_IRUGO, proc_net_devsnmp6);
+	p = proc_create(idev->dev->name, S_IRUGO,
+			proc_net_devsnmp6, &snmp6_seq_fops);
 	if (!p)
 		return -ENOMEM;
 
 	p->data = idev;
-	p->proc_fops = &snmp6_seq_fops;
 
 	idev->stats.proc_dir_entry = p;
 	return 0;