From: stephen hemminger <shemminger@vyatta.com>
Date: Wed, 15 Sep 2010 17:22:17 +0000 (+0000)
Subject: sky2: enable GRO by default
X-Git-Tag: v2.6.37-rc1~147^2~424
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1953925ea61cd1a77828deddc61d000303dbbb97;p=~shefty%2Frdma-dev.git

sky2: enable GRO by default

The driver has supported GRO for a while, but it was not enabled
by default.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 194e5cf8c76..3ef9b67ac6e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4581,7 +4581,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 
 	sky2->port = port;
 
-	dev->features |= NETIF_F_TSO | NETIF_F_IP_CSUM | NETIF_F_SG;
+	dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG
+		| NETIF_F_TSO  | NETIF_F_GRO;
 	if (highmem)
 		dev->features |= NETIF_F_HIGHDMA;