From: Randy Dunlap <rdunlap@xenotime.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org, David Miller <davem@davemloft.net>
Subject: [PATCH -next] net: fix net/core/sock.c build error
Date: Mon, 10 Sep 2012 09:13:07 -0700 [thread overview]
Message-ID: <504E1193.4060809@xenotime.net> (raw)
In-Reply-To: <20120910172407.c5ad953c008165fcd862bd3c@canb.auug.org.au>
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);
next prev parent reply other threads:[~2012-09-10 16:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 7:24 linux-next: Tree for Sept 10 Stephen Rothwell
2012-09-10 16:03 ` [PATCH -next] staging: fix ccg build when NET is not enabled Randy Dunlap
2012-09-10 16:13 ` Randy Dunlap [this message]
2012-09-10 20:45 ` [PATCH -next] net: fix net/core/sock.c build error David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=504E1193.4060809@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).