From 5c00bfaf8900f4174c71a83a59d1d49352cd5b89 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 29 Jan 2011 20:44:54 -0800
Subject: [PATCH] --- yaml --- r: 232836 b: refs/heads/master c:
 66c46d741e2e60f0e8b625b80edb0ab820c46d7a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 11f75c267c7f..5dc523dc0d37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f2771f2b85aea4d0f9a0137ad3b63d1173c0962
+refs/heads/master: 66c46d741e2e60f0e8b625b80edb0ab820c46d7a
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 24ea2d71e7ea..93e44dbf6793 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3424,6 +3424,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
 	__skb_pull(skb, skb_headlen(skb));
 	skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
 	skb->vlan_tci = 0;
+	skb->dev = napi->dev;
 
 	napi->skb = skb;
 }