summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2010-09-23 11:19:54 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-26 18:48:40 -0700
commit693019e90ca45d881109d32c0c6d29adf03f6447 (patch)
tree76142f67118da6998584172d609a32d989bfccc8
parenta3d6713fbd2ccb50898a6f88664da96a7857c039 (diff)
downloadblackbird-op-linux-693019e90ca45d881109d32c0c6d29adf03f6447.tar.gz
blackbird-op-linux-693019e90ca45d881109d32c0c6d29adf03f6447.zip
net: reset skb queue mapping when rx'ing over tunnel
Reset queue mapping when an skb is reentering the stack via a tunnel. On second pass, the queue mapping from the original device is no longer valid. Signed-off-by: Tom Herbert <therbert@google.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/dst.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 81d1413a8701..02386505033d 100644
--- a/include/net/dst.h
+++ b/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);
}
OpenPOWER on IntegriCloud