ipv4: Use flowi4->{daddr,saddr} in ipip_tunnel_xmit().
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 May 2011 18:10:28 +0000 (11:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 May 2011 18:10:28 +0000 (11:10 -0700)
Instead of rt->rt_{dst,src}

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipip.c

index 88d96bde950099089705190dcebcb3c1894af64f..bfa0b9895040c39bdc62cd6cf5457ca34a0f89ce 100644 (file)
@@ -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;