summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-08-01 11:10:25 +0800
committerDavid S. Miller <davem@davemloft.net>2013-08-01 15:11:17 -0700
commite0d1095ae3405404d247afb00233ef837d58da83 (patch)
tree1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720 /net/socket.c
parentdfcefb0be1231982784df2152213103ad33c1cfd (diff)
downloadlinux-e0d1095ae3405404d247afb00233ef837d58da83.tar.gz
linux-e0d1095ae3405404d247afb00233ef837d58da83.tar.bz2
linux-e0d1095ae3405404d247afb00233ef837d58da83.zip
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 'net/socket.c')
-rw-r--r--net/socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 829b460acb87..b2d7c629eeb9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -106,7 +106,7 @@
#include <linux/atalk.h>
#include <net/busy_poll.h>
-#ifdef CONFIG_NET_LL_RX_POLL
+#ifdef CONFIG_NET_RX_BUSY_POLL
unsigned int sysctl_net_busy_read __read_mostly;
unsigned int sysctl_net_busy_poll __read_mostly;
#endif