---

yaml --- r: 194306 b: refs/heads/master c: cb903bf h: refs/heads/master v: v3
git-mirror · Apr 21, 2010 · b5c1ed0 · b5c1ed0
1 parent 0d3620d
commit b5c1ed0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4fc9d15db72c8de7d4988e9f419b63b923e1d1d
+refs/heads/master: cb903bf4ee2d6e53210e2174d363e10698112042
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -12993,6 +12993,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
 		tp->dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 		if (tp->tg3_flags3 & TG3_FLG3_5755_PLUS)
 			tp->dev->features |= NETIF_F_IPV6_CSUM;
+		tp->dev->features |= NETIF_F_GRO;
 	}
 
 	/* Determine TSO capabilities */