diff options
author | Anton Blanchard <anton@samba.org> | 2011-10-14 01:31:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:00:55 -0400 |
commit | 2cb1deb56f5bf413da83491e0cb5a0474393c8ef (patch) | |
tree | 8305a957a114d49fec1f4c6af1009e9acd754b0b /drivers/net/ethernet/ibm/ehea/ehea.h | |
parent | 239c562c94dcdd2aeb3d0c0e604627dec043183e (diff) |
ehea: Remove LRO support
In preparation for adding GRO to ehea, remove LRO.
v3:
[cascardo] fixed conflict with vlan cleanup
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/ehea/ehea.h')
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h index c9dbe5258ca4..410d6a1984ed 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea.h +++ b/drivers/net/ethernet/ibm/ehea/ehea.h | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
34 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
35 | #include <linux/if_vlan.h> | 35 | #include <linux/if_vlan.h> |
36 | #include <linux/inet_lro.h> | ||
37 | 36 | ||
38 | #include <asm/ibmebus.h> | 37 | #include <asm/ibmebus.h> |
39 | #include <asm/abs_addr.h> | 38 | #include <asm/abs_addr.h> |
@@ -58,7 +57,6 @@ | |||
58 | #define EHEA_MIN_ENTRIES_QP 127 | 57 | #define EHEA_MIN_ENTRIES_QP 127 |
59 | 58 | ||
60 | #define EHEA_SMALL_QUEUES | 59 | #define EHEA_SMALL_QUEUES |
61 | #define EHEA_LRO_MAX_AGGR 64 | ||
62 | 60 | ||
63 | #ifdef EHEA_SMALL_QUEUES | 61 | #ifdef EHEA_SMALL_QUEUES |
64 | #define EHEA_MAX_CQE_COUNT 1023 | 62 | #define EHEA_MAX_CQE_COUNT 1023 |
@@ -85,8 +83,6 @@ | |||
85 | #define EHEA_RQ2_PKT_SIZE 2048 | 83 | #define EHEA_RQ2_PKT_SIZE 2048 |
86 | #define EHEA_L_PKT_SIZE 256 /* low latency */ | 84 | #define EHEA_L_PKT_SIZE 256 /* low latency */ |
87 | 85 | ||
88 | #define MAX_LRO_DESCRIPTORS 8 | ||
89 | |||
90 | /* Send completion signaling */ | 86 | /* Send completion signaling */ |
91 | 87 | ||
92 | /* Protection Domain Identifier */ | 88 | /* Protection Domain Identifier */ |
@@ -382,8 +378,6 @@ struct ehea_port_res { | |||
382 | u64 tx_bytes; | 378 | u64 tx_bytes; |
383 | u64 rx_packets; | 379 | u64 rx_packets; |
384 | u64 rx_bytes; | 380 | u64 rx_bytes; |
385 | struct net_lro_mgr lro_mgr; | ||
386 | struct net_lro_desc lro_desc[MAX_LRO_DESCRIPTORS]; | ||
387 | int sq_restart_flag; | 381 | int sq_restart_flag; |
388 | }; | 382 | }; |
389 | 383 | ||
@@ -468,7 +462,6 @@ struct ehea_port { | |||
468 | u32 msg_enable; | 462 | u32 msg_enable; |
469 | u32 sig_comp_iv; | 463 | u32 sig_comp_iv; |
470 | u32 state; | 464 | u32 state; |
471 | u32 lro_max_aggr; | ||
472 | u8 phy_link; | 465 | u8 phy_link; |
473 | u8 full_duplex; | 466 | u8 full_duplex; |
474 | u8 autoneg; | 467 | u8 autoneg; |