Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

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

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 571d95a21c15a54d067647cfa5c7bd7cf50c82c0..35e502a72495f97efc72c7f386e25ca9d53f95e0 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(), ip6_frag_mem());
+                      ip6_frag_nqueues(&init_net), ip6_frag_mem(&init_net));
        return 0;
 }