projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbb1e85
)
ipv6: Use flowi4->{daddr,saddr} in ipip6_tunnel_xmit().
author
David S. Miller
<davem@davemloft.net>
Wed, 4 May 2011 19:46:24 +0000
(12:46 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 4 May 2011 19:55:07 +0000
(12:55 -0700)
Instead of rt->rt_{dst,src}
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/sit.c
patch
|
blob
|
history
diff --git
a/net/ipv6/sit.c
b/net/ipv6/sit.c
index a24fb14d91f30f9ca396fe3feb0c3cb3e935081b..c53abcf50d298b05d59ce0db1b9fe82960e79d31 100644
(file)
--- 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;