From 65a3c85413f94845727048de0ac75cd4c7e41bbd Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 10 Sep 2012 09:13:07 -0700
Subject: [PATCH] --- yaml --- r: 322792 b: refs/heads/master c:
 1c463e57b32e3b6a3250fe75d1d56cb598d664e6 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38b54593de6f..9c4635ca2d57 100644
--- 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
index 7f64467535d1..305792076121 100644
--- 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);