diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-04 12:46:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-04 12:55:07 -0700 |
| commit | 301102cc832f9f3e24c5748705f152eaa7c307f6 (patch) | |
| tree | 40210f414aae480b41c15bae216c4ac2b97707ec /net/ipv6 | |
| parent | cbb1e85f9cfd2bd9b7edfd21d167e89a4279faf0 (diff) | |
| download | op-kernel-dev-301102cc832f9f3e24c5748705f152eaa7c307f6.zip op-kernel-dev-301102cc832f9f3e24c5748705f152eaa7c307f6.tar.gz | |
ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().
Instead of rt->rt_{dst,src}
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index a24fb14..c53abcf 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, 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; |
