lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlx4_en: Remove remnants of LRO support

Browse Source 
Commit fa37a9586f ('mlx4_en: Moving to
work with GRO') left behind the Kconfig depends/select, some dead
code and comments referring to LRO.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings
2012-11-16 12:44:56 +00:00
committed by David S. Miller
parent 01f1c6b994
commit f1d29a3fa6
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/mellanox/mlx4/Kconfig
View File

@@ -4,9 +4,8 @@
config MLX4_EN config MLX4_EN
tristate "Mellanox Technologies 10Gbit Ethernet support" tristate "Mellanox Technologies 10Gbit Ethernet support"
depends on PCI && INET depends on PCI
select MLX4_CORE select MLX4_CORE
select INET_LRO
---help--- ---help---
This driver supports Mellanox Technologies ConnectX Ethernet This driver supports Mellanox Technologies ConnectX Ethernet
devices. devices.

9
drivers/net/ethernet/mellanox/mlx4/en_rx.c
View File

@@ -630,7 +630,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
if ((cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) && if ((cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
(cqe->checksum == cpu_to_be16(0xffff))) { (cqe->checksum == cpu_to_be16(0xffff))) {
ring->csum_ok++; ring->csum_ok++;
/* This packet is eligible for LRO if it is: /* This packet is eligible for GRO if it is:
* - DIX Ethernet (type interpretation) * - DIX Ethernet (type interpretation)
* - TCP/IP (v4) * - TCP/IP (v4)
* - without IP options * - without IP options
@@ -667,7 +667,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
goto next; goto next;
} }
/* LRO not possible, complete processing here */ /* GRO not possible, complete processing here */
ip_summed = CHECKSUM_UNNECESSARY; ip_summed = CHECKSUM_UNNECESSARY;
} else { } else {
ip_summed = CHECKSUM_NONE; ip_summed = CHECKSUM_NONE;
@@ -710,11 +710,8 @@ next:
++cq->mcq.cons_index; ++cq->mcq.cons_index;
index = (cq->mcq.cons_index) & ring->size_mask; index = (cq->mcq.cons_index) & ring->size_mask;
cqe = &cq->buf[index]; cqe = &cq->buf[index];
if (++polled == budget) { if (++polled == budget)
/* We are here because we reached the NAPI budget -
* flush only pending LRO sessions */
goto out; goto out;
}
} }
out: out:

17
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
View File

@@ -95,8 +95,6 @@
#define MLX4_EN_ALLOC_SIZE PAGE_ALIGN(16384) #define MLX4_EN_ALLOC_SIZE PAGE_ALIGN(16384)
#define MLX4_EN_ALLOC_ORDER get_order(MLX4_EN_ALLOC_SIZE) #define MLX4_EN_ALLOC_ORDER get_order(MLX4_EN_ALLOC_SIZE)
#define MLX4_EN_MAX_LRO_DESCRIPTORS 32
/* Receive fragment sizes; we use at most 4 fragments (for 9600 byte MTU /* Receive fragment sizes; we use at most 4 fragments (for 9600 byte MTU
* and 4K allocations) */ * and 4K allocations) */
enum { enum {
@@ -290,21 +288,6 @@ struct mlx4_en_rx_ring {
unsigned long csum_none; unsigned long csum_none;
}; };
static inline int mlx4_en_can_lro(__be16 status)
{
return (status & cpu_to_be16(MLX4_CQE_STATUS_IPV4 |
MLX4_CQE_STATUS_IPV4F |
MLX4_CQE_STATUS_IPV6 |
MLX4_CQE_STATUS_IPV4OPT |
MLX4_CQE_STATUS_TCP |
MLX4_CQE_STATUS_UDP |
MLX4_CQE_STATUS_IPOK)) ==
cpu_to_be16(MLX4_CQE_STATUS_IPV4 |
MLX4_CQE_STATUS_IPOK |
MLX4_CQE_STATUS_TCP);
}
struct mlx4_en_cq { struct mlx4_en_cq {
struct mlx4_cq mcq; struct mlx4_cq mcq;
struct mlx4_hwq_resources wqres; struct mlx4_hwq_resources wqres;