Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / net / ipv6 / proc.c

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index ca8b82f96fe5797625dfad774184ab128af54ee7..cbc7e514d3ecab4d125d20efb5292d0c4de6a9e8 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -7,8 +7,6 @@
  *             PROC file system.  This is very similar to the IPv4 version,
  *             except it reports the sockets in the INET6 address family.
  *
- * Version:    $Id: proc.c,v 1.17 2002/02/01 22:01:04 davem Exp $
- *
  * Authors:    David S. Miller (davem@caip.rutgers.edu)
  *             YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  *
@@ -247,13 +245,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;
 }