From 4d49b8463ece085d0363e0bb008a7b1bc7c79435 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: 184305 b: refs/heads/master c:
 e76b69cc0133952c98aa1ad6330cacacd269fd64 h: refs/heads/master i:   184303:
 9f145557fcc9937298ede08faf04e60b5b708aaa v: v3

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

diff --git a/[refs] b/[refs]
index dbe61f0e25e5..4f9d4cc9ca11 100644
--- 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
index d1cf53d0d597..1968980f513a 100644
--- 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);