diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /net/ipv4/proc.c | |
parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) |
Merge with 2.4.0-test7.
Diffstat (limited to 'net/ipv4/proc.c')
-rw-r--r-- | net/ipv4/proc.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index f1ff8f1ee..559d75aac 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -7,7 +7,7 @@ * PROC file system. It is mainly used for debugging and * statistics. * - * Version: $Id: proc.c,v 1.43 2000/07/07 22:29:42 davem Exp $ + * Version: $Id: proc.c,v 1.44 2000/08/09 11:59:04 davem Exp $ * * Authors: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> * Gerald J. Heim, <heim@peanuts.informatik.uni-tuebingen.de> @@ -71,9 +71,11 @@ int afinet_get_info(char *buffer, char **start, off_t offset, int length) int len = socket_get_info(buffer,start,offset,length); - len += sprintf(buffer+len,"TCP: inuse %d orphan %d tw %d\n", + len += sprintf(buffer+len,"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_orphan_count), tcp_tw_count, + atomic_read(&tcp_sockets_allocated), + atomic_read(&tcp_memory_allocated)); len += sprintf(buffer+len,"UDP: inuse %d\n", fold_prot_inuse(&udp_prot)); len += sprintf(buffer+len,"RAW: inuse %d\n", @@ -175,7 +177,22 @@ int netstat_get_info(char *buffer, char **start, off_t offset, int length) " ListenOverflows ListenDrops" " TCPPrequeued TCPDirectCopyFromBacklog" " TCPDirectCopyFromPrequeue TCPPrequeueDropped" - " TCPHPHits TCPHPHitsToUser\n" + " TCPHPHits TCPHPHitsToUser" + " TCPPureAcks TCPHPAcks" + " TCPRenoRecovery TCPSackRecovery" + " TCPSACKReneging" + " TCPFACKReorder TCPSACKReorder TCPRenoReorder TCPTSReorder" + " TCPFullUndo TCPPartialUndo TCPDSACKUndo TCPLossUndo" + " TCPLoss TCPLostRetransmit" + " TCPRenoFailures TCPSackFailures TCPLossFailures" + " TCPFastRetrans TCPForwardRetrans TCPSlowStartRetrans" + " TCPTimeouts" + " TCPRenoRecoveryFail TCPSackRecoveryFail" + " TCPSchedulerFailed TCPRcvCollapsed" + " TCPDSACKOldSent TCPDSACKOfoSent TCPDSACKRecv TCPDSACKOfoRecv" + " TCPAbortOnSyn TCPAbortOnData TCPAbortOnClose" + " TCPAbortOnMemory TCPAbortOnTimeout TCPAbortOnLinger" + " TCPAbortFailed TCPMemoryPressures\n" "TcpExt:"); for (i=0; i<offsetof(struct linux_mib, __pad)/sizeof(unsigned long); i++) len += sprintf(buffer+len, " %lu", fold_field((unsigned long*)net_statistics, sizeof(struct linux_mib), i)); |