net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set
authorCong Wang <amwang@redhat.com>
Thu, 1 Aug 2013 03:10:24 +0000 (11:10 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Aug 2013 22:10:58 +0000 (15:10 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/busy_poll.h

index a14339c2985ff0f24e259861fa39dcf335f601b5..6cd8848fec682e34919ad7f81bcb0026b6db4cb5 100644 (file)
@@ -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 */