From bd527b92c886d68da79c41e64a56cf7c89ed89c6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 17 Jun 2008 21:26:37 -0700
Subject: [PATCH] --- yaml --- r: 103009 b: refs/heads/master c:
 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 h: refs/heads/master i:   103007:
 ee234e33603e6da94ae72896f3dee86157d71dfc v: v3

---
 [refs]                          | 2 +-
 trunk/net/ax25/ax25_std_timer.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 62e62cf02ba0..b61109e136fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d45abe1c2949183e5d9cb25721bf1c42c7b5e3b
+refs/heads/master: 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74
diff --git a/trunk/net/ax25/ax25_std_timer.c b/trunk/net/ax25/ax25_std_timer.c
index 96e4b9273250..cdc7e751ef36 100644
--- a/trunk/net/ax25/ax25_std_timer.c
+++ b/trunk/net/ax25/ax25_std_timer.c
@@ -39,11 +39,9 @@ void ax25_std_heartbeat_expiry(ax25_cb *ax25)
 
 	switch (ax25->state) {
 	case AX25_STATE_0:
-		/* Magic here: If we listen() and a new link dies before it
-		   is accepted() it isn't 'dead' so doesn't get removed. */
-		if (!sk || sock_flag(sk, SOCK_DESTROY) ||
-		    (sk->sk_state == TCP_LISTEN &&
-		     sock_flag(sk, SOCK_DEAD))) {
+		if (!sk ||
+		    sock_flag(sk, SOCK_DESTROY) ||
+		    sock_flag(sk, SOCK_DEAD)) {
 			if (sk) {
 				sock_hold(sk);
 				ax25_destroy_socket(ax25);