---

yaml --- r: 347305 b: refs/heads/master c: 76fe458 h: refs/heads/master i: 347303: 605c122 v: v3
git-mirror · Dec 17, 2012 · 8bcc590 · 8bcc590
1 parent 7feb0dd
commit 8bcc590
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);