From: Jeff Kirsher Date: Thu, 19 Feb 2009 01:56:25 +0000 (-0800) Subject: igb: remove LRO Kconfig option X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5fbbcb79e5371d99565826a352c1003d0f1f0678;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3fed3347f4b..683a5ac4e12 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2019,14 +2019,6 @@ config IGB To compile this driver as a module, choose M here. The module will be called igb. -config IGB_LRO - bool "Use software LRO" - depends on IGB && INET - ---help--- - Say Y here if you want to use large receive offload. - - If in doubt, say N. - config IGB_DCA bool "Direct Cache Access (DCA) Support" default y diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 43f489aba19..457f12e345c 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, netdev->features |= NETIF_F_TSO; netdev->features |= NETIF_F_TSO6; -#ifdef CONFIG_IGB_LRO netdev->features |= NETIF_F_GRO; -#endif netdev->vlan_features |= NETIF_F_TSO; netdev->vlan_features |= NETIF_F_TSO6;