diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/ipv4/proc.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
| download | kernel-crypto-129521dcc94f781890f8f668219ab79f0073ff9f.tar.gz kernel-crypto-129521dcc94f781890f8f668219ab79f0073ff9f.tar.xz kernel-crypto-129521dcc94f781890f8f668219ab79f0073ff9f.zip | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/ipv4/proc.c')
| -rw-r--r-- | net/ipv4/proc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 912bbcc7f41..f7943ba1f43 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -59,13 +59,10 @@ static int fold_prot_inuse(struct proto *proto) */ static int sockstat_seq_show(struct seq_file *seq, void *v) { - /* From net/socket.c */ - extern void socket_seq_show(struct seq_file *seq); - socket_seq_show(seq); seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n", fold_prot_inuse(&tcp_prot), atomic_read(&tcp_orphan_count), - tcp_tw_count, atomic_read(&tcp_sockets_allocated), + tcp_death_row.tw_count, atomic_read(&tcp_sockets_allocated), atomic_read(&tcp_memory_allocated)); seq_printf(seq, "UDP: inuse %d\n", fold_prot_inuse(&udp_prot)); seq_printf(seq, "RAW: inuse %d\n", fold_prot_inuse(&raw_prot)); |