summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-06 12:53:50 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-06 12:53:50 -0700
commit33d1d2c52c3befa6c4df33b4ba58137d1c48894b (patch)
tree63ebb1ace5e89491f65e6282c9aee7b232175f33
parent88a944eef8a4f9a2ca647eb16202a2b63f8ba7cd (diff)
downloadlinux-3.10-33d1d2c52c3befa6c4df33b4ba58137d1c48894b.tar.gz
linux-3.10-33d1d2c52c3befa6c4df33b4ba58137d1c48894b.tar.bz2
linux-3.10-33d1d2c52c3befa6c4df33b4ba58137d1c48894b.zip
ax25: Quick fix for making sure unaccepted sockets get destroyed.
Since we reverted 30902dc3cb0ea1cfc7ac2b17bcf478ff98420d74 ("ax25: Fix std timer socket destroy handling.") we have to put some kind of fix in to cure the issue whereby unaccepted connections do not get destroyed. The approach used here is from Tihomir Heidelberg - 9a4gl Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ax25/af_ax25.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 01c83e2a4c1..28c71574a78 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -317,6 +317,9 @@ void ax25_destroy_socket(ax25_cb *ax25)
/* Queue the unaccepted socket for death */
sock_orphan(skb->sk);
+ /* 9A4GL: hack to release unaccepted sockets */
+ skb->sk->sk_state = TCP_LISTEN;
+
ax25_start_heartbeat(sax25);
sax25->state = AX25_STATE_0;
}