diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-11 14:59:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-11 14:59:24 -0700 |
| commit | 6401f37c6eec16b9370e539ce9225f44f1cb09fb (patch) | |
| tree | e73ac37a02171305e0efbaae972b38ef0a998a22 /include/net | |
| parent | 54a6a043fb8580d5a741774669ef6049f402f228 (diff) | |
| parent | 2ed46ce45ec02f6b2188419acdf372a144e06fb5 (diff) | |
| download | cachepc-linux-6401f37c6eec16b9370e539ce9225f44f1cb09fb.tar.gz cachepc-linux-6401f37c6eec16b9370e539ce9225f44f1cb09fb.zip | |
Merge branch 'bpf-Minor-fix-in-bpf_convert_ctx_access'
Daniel Borkmann says:
====================
bpf: Minor fix in bpf_convert_ctx_access
First one was found while trying to compile the kernel
with !CONFIG_NET_RX_BUSY_POLL.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/busy_poll.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 8ffd434676b7..71c72a939bf8 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -29,18 +29,18 @@ #include <linux/sched/signal.h> #include <net/ip.h> -#ifdef CONFIG_NET_RX_BUSY_POLL - -struct napi_struct; -extern unsigned int sysctl_net_busy_read __read_mostly; -extern unsigned int sysctl_net_busy_poll __read_mostly; - /* 0 - Reserved to indicate value not set * 1..NR_CPUS - Reserved for sender_cpu * NR_CPUS+1..~0 - Region available for NAPI IDs */ #define MIN_NAPI_ID ((unsigned int)(NR_CPUS + 1)) +#ifdef CONFIG_NET_RX_BUSY_POLL + +struct napi_struct; +extern unsigned int sysctl_net_busy_read __read_mostly; +extern unsigned int sysctl_net_busy_poll __read_mostly; + static inline bool net_busy_loop_on(void) { return sysctl_net_busy_poll; |