diff options
| author | Cong Wang <amwang@redhat.com> | 2013-08-01 11:10:25 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-01 15:11:17 -0700 |
| commit | e0d1095ae3405404d247afb00233ef837d58da83 (patch) | |
| tree | 1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720 /include/net | |
| parent | dfcefb0be1231982784df2152213103ad33c1cfd (diff) | |
| download | op-kernel-dev-e0d1095ae3405404d247afb00233ef837d58da83.zip op-kernel-dev-e0d1095ae3405404d247afb00233ef837d58da83.tar.gz | |
net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
Eliezer renames several *ll_poll to *busy_poll, but forgets
CONFIG_NET_LL_RX_POLL, so in case of confusion, rename it too.
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 | 6 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 6cd8848..f18b919 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -27,7 +27,7 @@ #include <linux/netdevice.h> #include <net/ip.h> -#ifdef CONFIG_NET_LL_RX_POLL +#ifdef CONFIG_NET_RX_BUSY_POLL struct napi_struct; extern unsigned int sysctl_net_busy_read __read_mostly; @@ -146,7 +146,7 @@ static inline void sk_mark_napi_id(struct sock *sk, struct sk_buff *skb) sk->sk_napi_id = skb->napi_id; } -#else /* CONFIG_NET_LL_RX_POLL */ +#else /* CONFIG_NET_RX_BUSY_POLL */ static inline unsigned long net_busy_loop_on(void) { return 0; @@ -186,5 +186,5 @@ static inline bool sk_busy_loop(struct sock *sk, int nonblock) return false; } -#endif /* CONFIG_NET_LL_RX_POLL */ +#endif /* CONFIG_NET_RX_BUSY_POLL */ #endif /* _LINUX_NET_BUSY_POLL_H */ diff --git a/include/net/sock.h b/include/net/sock.h index 95a5a2c..31d5cfb 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -327,7 +327,7 @@ struct sock { #ifdef CONFIG_RPS __u32 sk_rxhash; #endif -#ifdef CONFIG_NET_LL_RX_POLL +#ifdef CONFIG_NET_RX_BUSY_POLL unsigned int sk_napi_id; unsigned int sk_ll_usec; #endif |
