aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEliezer Tamir <eliezer.tamir@linux.intel.com>2013-07-10 10:13:17 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-10 20:08:27 -0400
commit076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (patch)
treec97290b972a4c942bb1e312b67f4a4f22e3670e5 /net/core
parentbfffbea1aaeeb1eb6500c83ff9653416daa5b490 (diff)
net: rename include/net/ll_poll.h to include/net/busy_poll.h
Rename the file and correct all the places where it is included. Signed-off-by: Eliezer Tamir <eliezer.tamir@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/datagram.c2
-rw-r--r--net/core/sock.c2
-rw-r--r--net/core/sysctl_net_core.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 6e9ab31e457e..8ab48cd89559 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -56,7 +56,7 @@
56#include <net/sock.h> 56#include <net/sock.h>
57#include <net/tcp_states.h> 57#include <net/tcp_states.h>
58#include <trace/events/skb.h> 58#include <trace/events/skb.h>
59#include <net/ll_poll.h> 59#include <net/busy_poll.h>
60 60
61/* 61/*
62 * Is a socket 'connection oriented' ? 62 * Is a socket 'connection oriented' ?
diff --git a/net/core/sock.c b/net/core/sock.c
index ab06b719f5b1..9bfe83f4d670 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -139,7 +139,7 @@
139#include <net/tcp.h> 139#include <net/tcp.h>
140#endif 140#endif
141 141
142#include <net/ll_poll.h> 142#include <net/busy_poll.h>
143 143
144static DEFINE_MUTEX(proto_list_mutex); 144static DEFINE_MUTEX(proto_list_mutex);
145static LIST_HEAD(proto_list); 145static LIST_HEAD(proto_list);
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index afc677eadd93..1a298cb3daee 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -19,7 +19,7 @@
19#include <net/ip.h> 19#include <net/ip.h>
20#include <net/sock.h> 20#include <net/sock.h>
21#include <net/net_ratelimit.h> 21#include <net/net_ratelimit.h>
22#include <net/ll_poll.h> 22#include <net/busy_poll.h>
23 23
24static int one = 1; 24static int one = 1;
25 25