From b3aaae6879e127242408e7ca3d14ffbc1f450f23 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Fri, 2 May 2008 02:46:55 -0700
Subject: [PATCH] --- yaml --- r: 95884 b: refs/heads/master c:
 0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv6/proc.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6af7f7ed2514..297560d52e56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5efdccbcda20d3e5fbaa85f726dcc9cfeb005577
+refs/heads/master: 0bb53a66fe1258b1cb5eb1ea70768386f0c2a1ca
diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c
index ca8b82f96fe5..df0736a4cafa 100644
--- a/trunk/net/ipv6/proc.c
+++ b/trunk/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;
 }