summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipip.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-04 11:10:28 -0700
committerDavid S. Miller <davem@davemloft.net>2011-05-04 11:10:28 -0700
commit69458cb194e82972347a004054e0baed719ed008 (patch)
tree29e9a97a953994a86075cdf06e55ac1fe02a9733 /net/ipv4/ipip.c
parent9cddf15f18865c4f7124d829be41799f59aaa5cf (diff)
downloadop-kernel-dev-69458cb194e82972347a004054e0baed719ed008.zip
op-kernel-dev-69458cb194e82972347a004054e0baed719ed008.tar.gz
ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit().
Instead of rt->rt_{dst,src} Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r--net/ipv4/ipip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 88d96bd..bfa0b98 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;
OpenPOWER on IntegriCloud