From 6666b00dd84858d0ad487ab2960f242f16615efe Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 3 May 2011 20:41:42 -0700 Subject: [PATCH] --- yaml --- r: 247055 b: refs/heads/master c: 28c90da02ed7367fc5714adefce2a961e5bae306 h: refs/heads/master i: 247053: 52a57fd78c53f9029ebdfdc830f64c9dcc03a195 247051: c816814ed09bd3840c510140587388de20dda4d0 247047: d0a3743453df66c1e73f5da5fd0e0442ba04fd0f 247039: 26842f26244e9660586b2337616aabfa1c4be766 v: v3 --- [refs] | 2 +- trunk/drivers/net/pptp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index de6a0bc95fa7..57e606230cae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31e4543db29fb85496a122b965d6482c8d1a2bfe +refs/heads/master: 28c90da02ed7367fc5714adefce2a961e5bae306 diff --git a/trunk/drivers/net/pptp.c b/trunk/drivers/net/pptp.c index e771e8d27eb7..1286fe212dc4 100644 --- a/trunk/drivers/net/pptp.c +++ b/trunk/drivers/net/pptp.c @@ -271,8 +271,8 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) iph->frag_off = 0; iph->protocol = IPPROTO_GRE; iph->tos = 0; - iph->daddr = rt->rt_dst; - iph->saddr = rt->rt_src; + iph->daddr = fl4.daddr; + iph->saddr = fl4.saddr; iph->ttl = ip4_dst_hoplimit(&rt->dst); iph->tot_len = htons(skb->len);