From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 May 2011 18:10:28 +0000 (-0700)
Subject: ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit().
X-Git-Tag: MMI-PSA29.97-13-9~19691^2~178
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=69458cb194e82972347a004054e0baed719ed008;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit().

Instead of rt->rt_{dst,src}

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

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 88d96bde9500..bfa0b9895040 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -550,8 +550,8 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	iph->frag_off		=	df;
 	iph->protocol		=	IPPROTO_IPIP;
 	iph->tos		=	INET_ECN_encapsulate(tos, old_iph->tos);
-	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	=	old_iph->ttl;