From 5a5c91140f2728bbfd6e988916e9bad125132f5f Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Wed, 8 Dec 2010 12:16:33 -0800
Subject: [PATCH] --- yaml --- r: 223219 b: refs/heads/master c:
 67631510a318d5a930055fe927607f483716e100 h: refs/heads/master i:   223217:
 0354eb941f3f57b03cb31c012a102677b2120225   223215:
 6f2aadfbb1757face5ddf21c1dd93c14bd8fa82c v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/snmp.h     | 1 +
 trunk/net/ipv4/proc.c          | 1 +
 trunk/net/ipv4/tcp_minisocks.c | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1d709af5220..19609114d4c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 171995e5d82dcc92bea37a7d2a2ecc21068a0f19
+refs/heads/master: 67631510a318d5a930055fe927607f483716e100
diff --git a/trunk/include/linux/snmp.h b/trunk/include/linux/snmp.h
index ebb0c80ffd6e..12b2b18e50c1 100644
--- a/trunk/include/linux/snmp.h
+++ b/trunk/include/linux/snmp.h
@@ -230,6 +230,7 @@ enum
 	LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */
 	LINUX_MIB_TCPDEFERACCEPTDROP,
 	LINUX_MIB_IPRPFILTER, /* IP Reverse Path Filter (rp_filter) */
+	LINUX_MIB_TCPTIMEWAITOVERFLOW,		/* TCPTimeWaitOverflow */
 	__LINUX_MIB_MAX
 };
 
diff --git a/trunk/net/ipv4/proc.c b/trunk/net/ipv4/proc.c
index 1b48eb1ed453..b14ec7d03b6e 100644
--- a/trunk/net/ipv4/proc.c
+++ b/trunk/net/ipv4/proc.c
@@ -253,6 +253,7 @@ static const struct snmp_mib snmp4_net_list[] = {
 	SNMP_MIB_ITEM("TCPMinTTLDrop", LINUX_MIB_TCPMINTTLDROP),
 	SNMP_MIB_ITEM("TCPDeferAcceptDrop", LINUX_MIB_TCPDEFERACCEPTDROP),
 	SNMP_MIB_ITEM("IPReversePathFilter", LINUX_MIB_IPRPFILTER),
+	SNMP_MIB_ITEM("TCPTimeWaitOverflow", LINUX_MIB_TCPTIMEWAITOVERFLOW),
 	SNMP_MIB_SENTINEL
 };
 
diff --git a/trunk/net/ipv4/tcp_minisocks.c b/trunk/net/ipv4/tcp_minisocks.c
index 43cf901d7659..a66735f75963 100644
--- a/trunk/net/ipv4/tcp_minisocks.c
+++ b/trunk/net/ipv4/tcp_minisocks.c
@@ -347,7 +347,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
 		 * socket up.  We've got bigger problems than
 		 * non-graceful socket closings.
 		 */
-		LIMIT_NETDEBUG(KERN_INFO "TCP: time wait bucket table overflow\n");
+		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPTIMEWAITOVERFLOW);
 	}
 
 	tcp_update_metrics(sk);