netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Cong Wang <amwang@redhat.com>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
	Eliezer Tamir <eliezer.tamir@linux.intel.com>,
	Cong Wang <amwang@redhat.com>
Subject: [Patch net-next 1/2] net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set
Date: Thu,  1 Aug 2013 11:10:24 +0800	[thread overview]
Message-ID: <1375326625-21427-1-git-send-email-amwang@redhat.com> (raw)

From: Cong Wang <amwang@redhat.com>

When CONFIG_NET_LL_RX_POLL is not set, I got:

net/socket.c: In function ‘sock_poll’:
net/socket.c:1165:4: error: implicit declaration of function ‘sk_busy_loop’ [-Werror=implicit-function-declaration]

Fix this by adding a nop when !CONFIG_NET_LL_RX_POLL.

Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index a14339c..6cd8848 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -181,5 +181,10 @@ static inline bool busy_loop_timeout(unsigned long end_time)
 	return true;
 }
 
+static inline bool sk_busy_loop(struct sock *sk, int nonblock)
+{
+	return false;
+}
+
 #endif /* CONFIG_NET_LL_RX_POLL */
 #endif /* _LINUX_NET_BUSY_POLL_H */

             reply	other threads:[~2013-08-01  3:10 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-01  3:10 Cong Wang [this message]
2013-08-01  3:10 ` [Patch v2 net-next 2/2] net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL Cong Wang
2013-08-01 22:12   ` David Miller
2013-08-01  6:54 ` [Patch net-next 1/2] net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set Eliezer Tamir
2013-08-01  8:08   ` Cong Wang
2013-08-01 20:03     ` David Miller
2013-08-02  3:04       ` Eliezer Tamir
2013-08-02  5:51         ` David Miller
2013-08-01  7:18 ` David Miller
2013-08-01  7:29   ` Eliezer Tamir
2013-08-01 22:12 ` 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=1375326625-21427-1-git-send-email-amwang@redhat.com \
    --to=amwang@redhat.com \
    --cc=davem@davemloft.net \
    --cc=eliezer.tamir@linux.intel.com \
    --cc=netdev@vger.kernel.org \
    /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).