From 0bf382e0238b5e4cdd013f1761cbc7769595676f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Wed, 6 Mar 2013 11:02:37 +0000
Subject: [PATCH] --- yaml --- r: 361083 b: refs/heads/master c:
 f8af75f3517a24838a36eb5797a1a3e60bf9e276 h: refs/heads/master i:   361081:
 7ec6a19d372a034bc3c8192018af5f40eb771997   361079:
 3379130ce02880fbafc546d7473e67c64a6b6082 v: v3

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

diff --git a/[refs] b/[refs]
index 6cd2a07df3f3..7a1e60acbf18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 930df2dfc7073c9ed2d0b47a08e47027ae83c545
+refs/heads/master: f8af75f3517a24838a36eb5797a1a3e60bf9e276
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 2c6a22e278ea..b7c457adc0dc 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -747,6 +747,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
 		goto drop;
 	skb_orphan(skb);
 
+	nf_reset(skb);
+
 	/* Enqueue packet */
 	skb_queue_tail(&tfile->socket.sk->sk_receive_queue, skb);