From 196716d4ff00b8ad53ede4cac437c6c72f9a21ac Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Thu, 28 Aug 2008 01:09:54 -0700
Subject: [PATCH] --- yaml --- r: 111257 b: refs/heads/master c:
 6be547a61d6220199826070cda792297c3d15994 h: refs/heads/master i:   111255:
 ff790e0d3efb8c932b5b30b8ef462644752d2157 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/inet_diag.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c0eb7d4130f1..08ee32578ee2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eac56040787c3ff604fe7d48bbbb7897cd1387c
+refs/heads/master: 6be547a61d6220199826070cda792297c3d15994
diff --git a/trunk/net/ipv4/inet_diag.c b/trunk/net/ipv4/inet_diag.c
index c10036e7a463..89cb047ab314 100644
--- a/trunk/net/ipv4/inet_diag.c
+++ b/trunk/net/ipv4/inet_diag.c
@@ -782,11 +782,15 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
 		struct sock *sk;
 		struct hlist_node *node;
 
+		num = 0;
+
+		if (hlist_empty(&head->chain) && hlist_empty(&head->twchain))
+			continue;
+
 		if (i > s_i)
 			s_num = 0;
 
 		read_lock_bh(lock);
-		num = 0;
 		sk_for_each(sk, node, &head->chain) {
 			struct inet_sock *inet = inet_sk(sk);