commit e812347ccf9e8ce073b0ba0c49d03b124707b2b4
author Eric Dumazet <edumazet@google.com> Sun Sep 02 23:57:18 2012 +0000
committer David S. Miller <davem@davemloft.net> Mon Sep 03 13:22:43 2012 -0400
tree fc5602c3712ca9da46ceba4bb52143c07f77cebd
parent 5b716ac728bcc01b1f2a7ed6e437196602237c27

net: sock_edemux() should take care of timewait sockets

sock_edemux() can handle either a regular socket or a timewait socket

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/core/sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 8f67ced..7f64467 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1523,7 +1523,12 @@
 
 void sock_edemux(struct sk_buff *skb)
 {
-	sock_put(skb->sk);
+	struct sock *sk = skb->sk;
+
+	if (sk->sk_state == TCP_TIME_WAIT)
+		inet_twsk_put(inet_twsk(sk));
+	else
+		sock_put(sk);
 }
 EXPORT_SYMBOL(sock_edemux);