Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...

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

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index dec34c87cb4a962ce37b8ed051bd47982ce6a14d..199ef379e5017e10d1e1da74cfb0d865e8266f1c 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -44,7 +44,7 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
        seq_printf(seq, "RAW6: inuse %d\n",
                       sock_prot_inuse_get(&rawv6_prot));
        seq_printf(seq, "FRAG6: inuse %d memory %d\n",
-                      ip6_frag_nqueues(&init_net), ip6_frag_mem());
+                      ip6_frag_nqueues(&init_net), ip6_frag_mem(&init_net));
        return 0;
 }
 
@@ -217,12 +217,12 @@ int snmp6_register_dev(struct inet6_dev *idev)
        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;