diff options
| author | Cong Wang <amwang@redhat.com> | 2013-08-01 11:10:24 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-01 15:10:58 -0700 |
| commit | dfcefb0be1231982784df2152213103ad33c1cfd (patch) | |
| tree | 70dc6ca20c23745ce7bee67cbe5b1c9e2dd13032 /include/net | |
| parent | b30513202c6c14120f70b2e9aa1e97d47bbc2313 (diff) | |
| download | op-kernel-dev-dfcefb0be1231982784df2152213103ad33c1cfd.zip op-kernel-dev-dfcefb0be1231982784df2152213103ad33c1cfd.tar.gz | |
net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set
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>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/busy_poll.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ |
