---

yaml --- r: 322792 b: refs/heads/master c: 1c463e5 h: refs/heads/master v: v3
git-mirror · Sep 10, 2012 · 65a3c85 · 65a3c85
1 parent e605ec6
commit 65a3c85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b836ddde177bdd5790ade83772860940bd481ea
+refs/heads/master: 1c463e57b32e3b6a3250fe75d1d56cb598d664e6
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -1525,9 +1525,11 @@ void sock_edemux(struct sk_buff *skb)
 {
 	struct sock *sk = skb->sk;
 
+#ifdef CONFIG_INET
 	if (sk->sk_state == TCP_TIME_WAIT)
 		inet_twsk_put(inet_twsk(sk));
 	else
+#endif
 		sock_put(sk);
 }
 EXPORT_SYMBOL(sock_edemux);