aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2009-02-18 20:56:25 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-18 20:56:25 -0500
commit5fbbcb79e5371d99565826a352c1003d0f1f0678 (patch)
tree0d0c38b9e625a22b165a38afb1f32ece1d8e54f2 /drivers/net
parente88721f87d8caa679e62d6004a9a5661f1ac7b0e (diff)
igb: remove LRO Kconfig option
To match ixgbe GRO functionality, we remove the LRO (which is now GRO) Kconfig option which enables GRO by default. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig8
-rw-r--r--drivers/net/igb/igb_main.c2
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3fed3347f4b3..683a5ac4e122 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2019,14 +2019,6 @@ config IGB
2019 To compile this driver as a module, choose M here. The module 2019 To compile this driver as a module, choose M here. The module
2020 will be called igb. 2020 will be called igb.
2021 2021
2022config IGB_LRO
2023 bool "Use software LRO"
2024 depends on IGB && INET
2025 ---help---
2026 Say Y here if you want to use large receive offload.
2027
2028 If in doubt, say N.
2029
2030config IGB_DCA 2022config IGB_DCA
2031 bool "Direct Cache Access (DCA) Support" 2023 bool "Direct Cache Access (DCA) Support"
2032 default y 2024 default y
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 43f489aba191..457f12e345ca 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1248,9 +1248,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1248 netdev->features |= NETIF_F_TSO; 1248 netdev->features |= NETIF_F_TSO;
1249 netdev->features |= NETIF_F_TSO6; 1249 netdev->features |= NETIF_F_TSO6;
1250 1250
1251#ifdef CONFIG_IGB_LRO
1252 netdev->features |= NETIF_F_GRO; 1251 netdev->features |= NETIF_F_GRO;
1253#endif
1254 1252
1255 netdev->vlan_features |= NETIF_F_TSO; 1253 netdev->vlan_features |= NETIF_F_TSO;
1256 netdev->vlan_features |= NETIF_F_TSO6; 1254 netdev->vlan_features |= NETIF_F_TSO6;