From d6914cfe3e6a0ce168ec505b06728f11cd1a7445 Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Thu, 23 Sep 2010 11:19:54 +0000
Subject: [PATCH] --- yaml --- r: 211115 b: refs/heads/master c:
 693019e90ca45d881109d32c0c6d29adf03f6447 h: refs/heads/master i:   211113:
 375e7110bf05f1220c85dea857779d9336b5add9   211111:
 4c59d9d4bd7f72111b75c937aa9437ebdcd10266 v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/dst.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2e33573a1593..9a55d8a99355 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3d6713fbd2ccb50898a6f88664da96a7857c039
+refs/heads/master: 693019e90ca45d881109d32c0c6d29adf03f6447
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index 81d1413a8701..02386505033d 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/include/net/dst.h
@@ -242,6 +242,7 @@ static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += skb->len;
 	skb->rxhash = 0;
+	skb_set_queue_mapping(skb, 0);
 	skb_dst_drop(skb);
 	nf_reset(skb);
 }