aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-04 15:46:24 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-04 15:55:07 -0400
commit301102cc832f9f3e24c5748705f152eaa7c307f6 (patch)
tree40210f414aae480b41c15bae216c4ac2b97707ec
parentcbb1e85f9cfd2bd9b7edfd21d167e89a4279faf0 (diff)
ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().
Instead of rt->rt_{dst,src} Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/sit.c4
1 files changed, 2 insertions, 2 deletions
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,
828 iph->frag_off = df; 828 iph->frag_off = df;
829 iph->protocol = IPPROTO_IPV6; 829 iph->protocol = IPPROTO_IPV6;
830 iph->tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6)); 830 iph->tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
831 iph->daddr = rt->rt_dst; 831 iph->daddr = fl4.daddr;
832 iph->saddr = rt->rt_src; 832 iph->saddr = fl4.saddr;
833 833
834 if ((iph->ttl = tiph->ttl) == 0) 834 if ((iph->ttl = tiph->ttl) == 0)
835 iph->ttl = iph6->hop_limit; 835 iph->ttl = iph6->hop_limit;