diff --git a/[refs] b/[refs] index 9680550fdad2..a04df501a4e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbb1e85f9cfd2bd9b7edfd21d167e89a4279faf0 +refs/heads/master: 301102cc832f9f3e24c5748705f152eaa7c307f6 diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c index a24fb14d91f3..c53abcf50d29 100644 --- a/trunk/net/ipv6/sit.c +++ b/trunk/net/ipv6/sit.c @@ -828,8 +828,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, iph->frag_off = df; iph->protocol = IPPROTO_IPV6; iph->tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6)); - 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 = iph6->hop_limit;