diff options
| author | Eliezer Tamir <eliezer.tamir@linux.intel.com> | 2013-07-10 10:13:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-10 20:08:27 -0400 |
| commit | 076bb0c82a44fbe46fe2c8527a5b5b64b69f679d (patch) | |
| tree | c97290b972a4c942bb1e312b67f4a4f22e3670e5 | |
| parent | bfffbea1aaeeb1eb6500c83ff9653416daa5b490 (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>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 | ||||
| -rw-r--r-- | fs/select.c | 2 | ||||
| -rw-r--r-- | include/net/busy_poll.h (renamed from include/net/ll_poll.h) | 0 | ||||
| -rw-r--r-- | net/core/datagram.c | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 2 | ||||
| -rw-r--r-- | net/core/sysctl_net_core.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 2 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 2 | ||||
| -rw-r--r-- | net/socket.c | 2 |
15 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index ec3aa1d451e8..05b6b4e8b073 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <net/tcp.h> | 24 | #include <net/tcp.h> |
| 25 | #include <net/ipv6.h> | 25 | #include <net/ipv6.h> |
| 26 | #include <net/ip6_checksum.h> | 26 | #include <net/ip6_checksum.h> |
| 27 | #include <net/ll_poll.h> | 27 | #include <net/busy_poll.h> |
| 28 | #include <linux/prefetch.h> | 28 | #include <linux/prefetch.h> |
| 29 | #include "bnx2x_cmn.h" | 29 | #include "bnx2x_cmn.h" |
| 30 | #include "bnx2x_init.h" | 30 | #include "bnx2x_init.h" |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index fb098b46c6a6..7be725cdfea8 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | #include <linux/dca.h> | 52 | #include <linux/dca.h> |
| 53 | #endif | 53 | #endif |
| 54 | 54 | ||
| 55 | #include <net/ll_poll.h> | 55 | #include <net/busy_poll.h> |
| 56 | 56 | ||
| 57 | #ifdef CONFIG_NET_LL_RX_POLL | 57 | #ifdef CONFIG_NET_LL_RX_POLL |
| 58 | #define LL_EXTENDED_STATS | 58 | #define LL_EXTENDED_STATS |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index caf204770569..0fb2438dc2c7 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
| 39 | #include <linux/hash.h> | 39 | #include <linux/hash.h> |
| 40 | #include <net/ip.h> | 40 | #include <net/ip.h> |
| 41 | #include <net/ll_poll.h> | 41 | #include <net/busy_poll.h> |
| 42 | 42 | ||
| 43 | #include <linux/mlx4/driver.h> | 43 | #include <linux/mlx4/driver.h> |
| 44 | #include <linux/mlx4/device.h> | 44 | #include <linux/mlx4/device.h> |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c index 76997b93fdfe..90746d37ac9b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <net/ll_poll.h> | 34 | #include <net/busy_poll.h> |
| 35 | #include <linux/mlx4/cq.h> | 35 | #include <linux/mlx4/cq.h> |
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/mlx4/qp.h> | 37 | #include <linux/mlx4/qp.h> |
diff --git a/fs/select.c b/fs/select.c index f9f49c40cfd4..35d4adc749d9 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/hrtimer.h> | 28 | #include <linux/hrtimer.h> |
| 29 | #include <linux/sched/rt.h> | 29 | #include <linux/sched/rt.h> |
| 30 | #include <linux/freezer.h> | 30 | #include <linux/freezer.h> |
| 31 | #include <net/ll_poll.h> | 31 | #include <net/busy_poll.h> |
| 32 | 32 | ||
| 33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| 34 | 34 | ||
diff --git a/include/net/ll_poll.h b/include/net/busy_poll.h index 76f034087743..76f034087743 100644 --- a/include/net/ll_poll.h +++ b/include/net/busy_poll.h | |||
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 | ||
| 144 | static DEFINE_MUTEX(proto_list_mutex); | 144 | static DEFINE_MUTEX(proto_list_mutex); |
| 145 | static LIST_HEAD(proto_list); | 145 | static 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 | ||
| 24 | static int one = 1; | 24 | static int one = 1; |
| 25 | 25 | ||
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 15cbfa94bd8e..5423223e93c2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -279,7 +279,7 @@ | |||
| 279 | 279 | ||
| 280 | #include <asm/uaccess.h> | 280 | #include <asm/uaccess.h> |
| 281 | #include <asm/ioctls.h> | 281 | #include <asm/ioctls.h> |
| 282 | #include <net/ll_poll.h> | 282 | #include <net/busy_poll.h> |
| 283 | 283 | ||
| 284 | int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; | 284 | int sysctl_tcp_fin_timeout __read_mostly = TCP_FIN_TIMEOUT; |
| 285 | 285 | ||
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 35675e46aff8..3a261b41a00c 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -75,7 +75,7 @@ | |||
| 75 | #include <net/netdma.h> | 75 | #include <net/netdma.h> |
| 76 | #include <net/secure_seq.h> | 76 | #include <net/secure_seq.h> |
| 77 | #include <net/tcp_memcontrol.h> | 77 | #include <net/tcp_memcontrol.h> |
| 78 | #include <net/ll_poll.h> | 78 | #include <net/busy_poll.h> |
| 79 | 79 | ||
| 80 | #include <linux/inet.h> | 80 | #include <linux/inet.h> |
| 81 | #include <linux/ipv6.h> | 81 | #include <linux/ipv6.h> |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 6b270e53c207..bcc0ff2c16da 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -109,7 +109,7 @@ | |||
| 109 | #include <trace/events/udp.h> | 109 | #include <trace/events/udp.h> |
| 110 | #include <linux/static_key.h> | 110 | #include <linux/static_key.h> |
| 111 | #include <trace/events/skb.h> | 111 | #include <trace/events/skb.h> |
| 112 | #include <net/ll_poll.h> | 112 | #include <net/busy_poll.h> |
| 113 | #include "udp_impl.h" | 113 | #include "udp_impl.h" |
| 114 | 114 | ||
| 115 | struct udp_table udp_table __read_mostly; | 115 | struct udp_table udp_table __read_mostly; |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 5cffa5c3e6b8..345bd92d4ddb 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | #include <net/inet_common.h> | 63 | #include <net/inet_common.h> |
| 64 | #include <net/secure_seq.h> | 64 | #include <net/secure_seq.h> |
| 65 | #include <net/tcp_memcontrol.h> | 65 | #include <net/tcp_memcontrol.h> |
| 66 | #include <net/ll_poll.h> | 66 | #include <net/busy_poll.h> |
| 67 | 67 | ||
| 68 | #include <asm/uaccess.h> | 68 | #include <asm/uaccess.h> |
| 69 | 69 | ||
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index b6f31437a1f8..40e72034da07 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <net/ip6_checksum.h> | 46 | #include <net/ip6_checksum.h> |
| 47 | #include <net/xfrm.h> | 47 | #include <net/xfrm.h> |
| 48 | #include <net/inet6_hashtables.h> | 48 | #include <net/inet6_hashtables.h> |
| 49 | #include <net/ll_poll.h> | 49 | #include <net/busy_poll.h> |
| 50 | 50 | ||
| 51 | #include <linux/proc_fs.h> | 51 | #include <linux/proc_fs.h> |
| 52 | #include <linux/seq_file.h> | 52 | #include <linux/seq_file.h> |
diff --git a/net/socket.c b/net/socket.c index 45afa648364a..6a3e9a3f50ad 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -104,7 +104,7 @@ | |||
| 104 | #include <linux/route.h> | 104 | #include <linux/route.h> |
| 105 | #include <linux/sockios.h> | 105 | #include <linux/sockios.h> |
| 106 | #include <linux/atalk.h> | 106 | #include <linux/atalk.h> |
| 107 | #include <net/ll_poll.h> | 107 | #include <net/busy_poll.h> |
| 108 | 108 | ||
| 109 | #ifdef CONFIG_NET_LL_RX_POLL | 109 | #ifdef CONFIG_NET_LL_RX_POLL |
| 110 | unsigned int sysctl_net_ll_read __read_mostly; | 110 | unsigned int sysctl_net_ll_read __read_mostly; |
