aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-11-16 07:46:43 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-19 19:13:59 -0500
commit3865fe169adfe4d5421db4b62d87c41d48845c18 (patch)
tree9bb6b79a32fcb239490198c76b367b20181d35e0
parentf1d29a3fa68ba7c0b78b659a0e427ab834a26b44 (diff)
ehea: Remove remnants of LRO support
Commit 2cb1deb56f5bf413da83491e0cb5a0474393c8ef ('ehea: Remove LRO support') left behind the Kconfig depends/select and feature flag. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ibm/Kconfig5
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index b9773d229192..6529d31595a7 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_IBM
6 bool "IBM devices" 6 bool "IBM devices"
7 default y 7 default y
8 depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \ 8 depends on MCA || PPC_PSERIES || PPC_PSERIES || PPC_DCR || \
9 (IBMEBUS && INET && SPARSEMEM) 9 (IBMEBUS && SPARSEMEM)
10 ---help--- 10 ---help---
11 If you have a network (Ethernet) card belonging to this class, say Y 11 If you have a network (Ethernet) card belonging to this class, say Y
12 and read the Ethernet-HOWTO, available from 12 and read the Ethernet-HOWTO, available from
@@ -33,8 +33,7 @@ source "drivers/net/ethernet/ibm/emac/Kconfig"
33 33
34config EHEA 34config EHEA
35 tristate "eHEA Ethernet support" 35 tristate "eHEA Ethernet support"
36 depends on IBMEBUS && INET && SPARSEMEM 36 depends on IBMEBUS && SPARSEMEM
37 select INET_LRO
38 ---help--- 37 ---help---
39 This driver supports the IBM pSeries eHEA ethernet adapter. 38 This driver supports the IBM pSeries eHEA ethernet adapter.
40 39
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index f4d2da0db1b1..09faf333e941 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -3028,7 +3028,7 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
3028 ehea_set_ethtool_ops(dev); 3028 ehea_set_ethtool_ops(dev);
3029 3029
3030 dev->hw_features = NETIF_F_SG | NETIF_F_TSO 3030 dev->hw_features = NETIF_F_SG | NETIF_F_TSO
3031 | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_LRO; 3031 | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX;
3032 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO 3032 dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
3033 | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX 3033 | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
3034 | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER 3034 | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER