---

yaml --- r: 214553 b: refs/heads/master c: 1953925 h: refs/heads/master i: 214551: 8963fbc v: v3
git-mirror · Sep 16, 2010 · 1408450 · 1408450
1 parent 5a445c4
commit 1408450
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;