From: Denis V. Lunev <den@openvz.org>
Date: Fri, 2 May 2008 09:46:55 +0000 (-0700)
Subject: ipv6: assign PDE->data before gluing PDE into /proc tree
X-Git-Tag: v2.6.26-rc1~5^2~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca;p=linux-2.6-omap-h63xx.git

ipv6: assign PDE->data before gluing PDE into /proc tree

Simply replace proc_create and further data assigned with proc_create_data.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index ca8b82f96fe..df0736a4caf 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -247,13 +247,11 @@ int snmp6_register_dev(struct inet6_dev *idev)
 	if (!proc_net_devsnmp6)
 		return -ENOENT;
 
-	p = proc_create(idev->dev->name, S_IRUGO,
-			proc_net_devsnmp6, &snmp6_seq_fops);
+	p = proc_create_data(idev->dev->name, S_IRUGO,
+			     proc_net_devsnmp6, &snmp6_seq_fops, idev);
 	if (!p)
 		return -ENOMEM;
 
-	p->data = idev;
-
 	idev->stats.proc_dir_entry = p;
 	return 0;
 }