From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 May 2011 19:46:24 +0000 (-0700)
Subject: ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=301102cc832f9f3e24c5748705f152eaa7c307f6;p=deliverable%2Flinux.git

ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().

Instead of rt->rt_{dst,src}

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index a24fb14d91f3..c53abcf50d29 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -828,8 +828,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 	iph->frag_off		=	df;
 	iph->protocol		=	IPPROTO_IPV6;
 	iph->tos		=	INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
-	iph->daddr		=	rt->rt_dst;
-	iph->saddr		=	rt->rt_src;
+	iph->daddr		=	fl4.daddr;
+	iph->saddr		=	fl4.saddr;
 
 	if ((iph->ttl = tiph->ttl) == 0)
 		iph->ttl	=	iph6->hop_limit;