---

yaml --- r: 134632 b: refs/heads/master c: 5fbbcb7 h: refs/heads/master v: v3
git-mirror · Feb 19, 2009 · 883e392 · 883e392
1 parent 37c103a
commit 883e392
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e88721f87d8caa679e62d6004a9a5661f1ac7b0e
+refs/heads/master: 5fbbcb79e5371d99565826a352c1003d0f1f0678
diff --git a/trunk/drivers/net/Kconfig b/trunk/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/trunk/drivers/net/igb/igb_main.c b/trunk/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;