Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / ipv4 / proc.c

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index eb62e58bff7922b0e62d8f883da79fc0a8bee53b..cf0cdeeb1db0bc32986b752057407643320c63c6 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -54,8 +54,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
        int orphans, sockets;
 
        local_bh_disable();
-       orphans = percpu_counter_sum_positive(&tcp_orphan_count),
-       sockets = percpu_counter_sum_positive(&tcp_sockets_allocated),
+       orphans = percpu_counter_sum_positive(&tcp_orphan_count);
+       sockets = percpu_counter_sum_positive(&tcp_sockets_allocated);
        local_bh_enable();
 
        socket_seq_show(seq);