From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 10 Sep 2012 16:13:07 +0000 (-0700)
Subject: net: fix net/core/sock.c build error
X-Git-Tag: v3.6-rc6~18^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c463e57b32e3b6a3250fe75d1d56cb598d664e6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

net: fix net/core/sock.c build error

Fix net/core/sock.c build error when CONFIG_INET is not enabled:

net/built-in.o: In function `sock_edemux':
(.text+0xd396): undefined reference to `inet_twsk_put'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index 7f64467..3057920 100644
--- a/net/core/sock.c
+++ b/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);