From 73fef4097c6215674aa71d3f579559f986b22a74 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 19 May 2009 16:19:08 -0700
Subject: [PATCH] --- yaml --- r: 150339 b: refs/heads/master c:
 97bc54152e3a91dd2dc297e8a084c05e93527e60 h: refs/heads/master i:   150337:
 fcd1a4154c5d8112e9053dc5a511b46c713e97b5   150335:
 8973956fb948db793a75c86567acf4d9fb426a0f v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/sfc/efx.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 4703431d7adc..d01d051d17ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 645069299a1c7358cf7330afe293f07552f11a5d
+refs/heads/master: 97bc54152e3a91dd2dc297e8a084c05e93527e60
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index bde8b7ac398a..343e8da1fa30 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -49,16 +49,6 @@ static struct workqueue_struct *reset_workqueue;
  *
  *************************************************************************/
 
-/*
- * Enable large receive offload (LRO) aka soft segment reassembly (SSR)
- *
- * This sets the default for new devices.  It can be controlled later
- * using ethtool.
- */
-static int lro = true;
-module_param(lro, int, 0644);
-MODULE_PARM_DESC(lro, "Large receive offload acceleration");
-
 /*
  * Use separate channels for TX and RX events
  *
@@ -2167,9 +2157,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
 	if (!net_dev)
 		return -ENOMEM;
 	net_dev->features |= (NETIF_F_IP_CSUM | NETIF_F_SG |
-			      NETIF_F_HIGHDMA | NETIF_F_TSO);
-	if (lro)
-		net_dev->features |= NETIF_F_GRO;
+			      NETIF_F_HIGHDMA | NETIF_F_TSO |
+			      NETIF_F_GRO);
 	/* Mask for features that also apply to VLAN devices */
 	net_dev->vlan_features |= (NETIF_F_ALL_CSUM | NETIF_F_SG |
 				   NETIF_F_HIGHDMA | NETIF_F_TSO);