From b29877071d3938b5ddda38f66c98616672b56a21 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 18 Jul 2007 02:04:39 -0700
Subject: [PATCH] --- yaml --- r: 61201 b: refs/heads/master c:
 f77ae9390438409b535f3b1854672e54120cd38b h: refs/heads/master i:   61199:
 d42d4a57f07c9761dbc42dd2163d1b7481363f04 v: v3

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

diff --git a/[refs] b/[refs]
index 046d2dd2abc5..a9d111648337 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d4372b5ae2f891e8bfa96c98d450255f58b4dc1
+refs/heads/master: f77ae9390438409b535f3b1854672e54120cd38b
diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c
index 856610f0624e..f87176055d0e 100644
--- a/trunk/drivers/net/pppol2tp.c
+++ b/trunk/drivers/net/pppol2tp.c
@@ -1049,7 +1049,13 @@ static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 		printk("\n");
 	}
 
+	memset(&(IPCB(skb2)->opt), 0, sizeof(IPCB(skb2)->opt));
+	IPCB(skb2)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
+			       IPSKB_REROUTED);
+	nf_reset(skb2);
+
 	/* Get routing info from the tunnel socket */
+	dst_release(skb2->dst);
 	skb2->dst = sk_dst_get(sk_tun);
 
 	/* Queue the packet to IP for output */