* [PATCH -next] net: fix net/core/sock.c build error
[not found] <20120910172407.c5ad953c008165fcd862bd3c@canb.auug.org.au>
@ 2012-09-10 16:13 ` Randy Dunlap
2012-09-10 20:45 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2012-09-10 16:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, netdev, David Miller
From: Randy Dunlap <rdunlap@xenotime.net>
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>
---
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -next] net: fix net/core/sock.c build error
2012-09-10 16:13 ` [PATCH -next] net: fix net/core/sock.c build error Randy Dunlap
@ 2012-09-10 20:45 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-09-10 20:45 UTC (permalink / raw)
To: rdunlap; +Cc: sfr, linux-next, linux-kernel, netdev
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 10 Sep 2012 09:13:07 -0700
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> 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>
Applied to 'net', thanks Randy.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-10 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120910172407.c5ad953c008165fcd862bd3c@canb.auug.org.au>
2012-09-10 16:13 ` [PATCH -next] net: fix net/core/sock.c build error Randy Dunlap
2012-09-10 20:45 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).