From 8bcc59099c98d18c28cc2f09204dd78831b6b136 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 17 Dec 2012 04:39:20 +0000
Subject: [PATCH] --- yaml --- r: 347305 b: refs/heads/master c:
 76fe45812a3b134c39170ca32dfd4b7217d33145 h: refs/heads/master i:   347303:
 605c1229b82fc427f038b9c6c987ec354f430838 v: v3

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

diff --git a/[refs] b/[refs]
index 464d7fd620a4..4e5b9a0a206b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df4841910758227cfc07ae645de781d687b3b215
+refs/heads/master: 76fe45812a3b134c39170ca32dfd4b7217d33145
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 255a9f574869..173acf5b369a 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1199,6 +1199,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
 		skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
 	}
 
+	skb_reset_network_header(skb);
 	rxhash = skb_get_rxhash(skb);
 	netif_rx_ni(skb);