Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / net / ipv4 / proc.c

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index bae32808616eeedd72921f832809b71f60fc74ad..d63474c6b400382f2b102069299f3069226fd3f6 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -62,7 +62,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
        seq_printf(seq, "UDPLITE: inuse %d\n", sock_prot_inuse_get(&udplite_prot));
        seq_printf(seq, "RAW: inuse %d\n", sock_prot_inuse_get(&raw_prot));
        seq_printf(seq,  "FRAG: inuse %d memory %d\n",
-                       ip_frag_nqueues(&init_net), ip_frag_mem());
+                       ip_frag_nqueues(&init_net), ip_frag_mem(&init_net));
        return 0;
 }