diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-04 14:10:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-04 14:10:28 -0400 |
commit | 69458cb194e82972347a004054e0baed719ed008 (patch) | |
tree | 29e9a97a953994a86075cdf06e55ac1fe02a9733 /net/ipv4 | |
parent | 9cddf15f18865c4f7124d829be41799f59aaa5cf (diff) |
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')
-rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
550 | iph->frag_off = df; | 550 | iph->frag_off = df; |
551 | iph->protocol = IPPROTO_IPIP; | 551 | iph->protocol = IPPROTO_IPIP; |
552 | iph->tos = INET_ECN_encapsulate(tos, old_iph->tos); | 552 | iph->tos = INET_ECN_encapsulate(tos, old_iph->tos); |
553 | iph->daddr = rt->rt_dst; | 553 | iph->daddr = fl4.daddr; |
554 | iph->saddr = rt->rt_src; | 554 | iph->saddr = fl4.saddr; |
555 | 555 | ||
556 | if ((iph->ttl = tiph->ttl) == 0) | 556 | if ((iph->ttl = tiph->ttl) == 0) |
557 | iph->ttl = old_iph->ttl; | 557 | iph->ttl = old_iph->ttl; |