From 009860bcda3aac7b79e85b3289955cda84ab51cd Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajitkhaparde@gmail.com>
Date: Tue, 16 Feb 2010 20:25:43 +0000
Subject: [PATCH] --- yaml --- r: 180761 b: refs/heads/master c:
 c4d49794ff2838038fd9756eae39c39a5a685833 h: refs/heads/master i:   180759:
 c147cde5cae59c61c7f8fdebaf21aaf541bca3a9 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9fbfd018c1c4..146aba520185 100644
--- 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
index be9924f60ec3..ec874218b206 100644
--- 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);