---

yaml --- r: 184305 b: refs/heads/master c: e76b69c h: refs/heads/master i: 184303: 9f14555 v: v3
git-mirror · Feb 17, 2010 · 4d49b84 · 4d49b84
1 parent f376799
commit 4d49b84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d4bd947c501ea1da81300280fb6aeec2cca9335
+refs/heads/master: e76b69cc0133952c98aa1ad6330cacacd269fd64
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2813,7 +2813,7 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,
 	switch (ret) {
 	case GRO_NORMAL:
 	case GRO_HELD:
-		skb->protocol = eth_type_trans(skb, napi->dev);
+		skb->protocol = eth_type_trans(skb, skb->dev);
 
 		if (ret == GRO_HELD)
 			skb_gro_pull(skb, -ETH_HLEN);