[PATCH -next] net: fix net/core/sock.c build error

From: Randy Dunlap <redacted>

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 <redacted>
---
 net/core/sock.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20120910.orig/net/core/sock.c
+++ linux-next-20120910/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);

From: Randy Dunlap <redacted>
Date: Mon, 10 Sep 2012 09:13:07 -0700

From: Randy Dunlap <redacted>

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 <redacted>

Applied to 'net', thanks Randy.