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 /drivers/net | |
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>
Diffstat (limited to 'drivers/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 |
4 files changed, 4 insertions, 4 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> |