From 140845048e22708be0ccc458a9eba455c24e20f1 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Wed, 15 Sep 2010 17:22:17 +0000
Subject: [PATCH] --- yaml --- r: 214553 b: refs/heads/master c:
 1953925ea61cd1a77828deddc61d000303dbbb97 h: refs/heads/master i:   214551:
 8963fbc0478967c59108e04a543e0f98e62547f0 v: v3

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

diff --git a/[refs] b/[refs]
index 3f13f415345b..b649f880e25b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95ae6b228f814fc0528d0506ee9f18ac333d6851
+refs/heads/master: 1953925ea61cd1a77828deddc61d000303dbbb97
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 194e5cf8c763..3ef9b67ac6e6 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/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;