projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b716ac
)
net: sock_edemux() should take care of timewait sockets
author
Eric Dumazet
<edumazet@google.com>
Sun, 2 Sep 2012 23:57:18 +0000
(23:57 +0000)
committer
David S. Miller
<davem@davemloft.net>
Mon, 3 Sep 2012 17:22:43 +0000
(13:22 -0400)
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
patch
|
blob
|
history
diff --git
a/net/core/sock.c
b/net/core/sock.c
index
8f67ced
..
7f64467
100644
(file)
--- a/
net/core/sock.c
+++ b/
net/core/sock.c
@@
-1523,7
+1523,12
@@
EXPORT_SYMBOL(sock_rfree);
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);