---

yaml --- r: 180761 b: refs/heads/master c: c4d4979 h: refs/heads/master i: 180759: c147cde v: v3
git-mirror · Feb 24, 2010 · 009860b · 009860b
1 parent 4b16602
commit 009860b
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: 675c60706cd197219c6e3e6e3f195475d842344e
+refs/heads/master: c4d49794ff2838038fd9756eae39c39a5a685833
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2761,7 +2761,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);