diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-07-17 21:38:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-18 08:59:58 -0700 |
| commit | d3818c92afabecfe6b8e5d2e3734c8753522987c (patch) | |
| tree | c23f13c54bd995910d023445ab9207e5d9cfdecb /include | |
| parent | 5abf7f7e0f6bdbfcac737f636497d7016d9507eb (diff) | |
| download | linux-d3818c92afabecfe6b8e5d2e3734c8753522987c.tar.gz | |
ipv6: fix inet6_csk_xmit()
We should provide to inet6_csk_route_socket a struct flowi6 pointer, so that net6_csk_xmit() works correctly instead of sending garbage. Also add some consts Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Yuchung Cheng <ycheng@google.com> Cc: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipv6.h | 4 | ||||
| -rw-r--r-- | include/net/ip6_route.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index bc6c8fd8ed01..379e433e15e0 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -299,9 +299,9 @@ struct ipv6_pinfo { struct in6_addr rcv_saddr; struct in6_addr daddr; struct in6_pktinfo sticky_pktinfo; - struct in6_addr *daddr_cache; + const struct in6_addr *daddr_cache; #ifdef CONFIG_IPV6_SUBTREES - struct in6_addr *saddr_cache; + const struct in6_addr *saddr_cache; #endif __be32 flow_label; diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index b6b6f7d6f3c0..5fa2af00634a 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -158,7 +158,8 @@ extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp); * Store a destination cache entry in a socket */ static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst, - struct in6_addr *daddr, struct in6_addr *saddr) + const struct in6_addr *daddr, + const struct in6_addr *saddr) { struct ipv6_pinfo *np = inet6_sk(sk); struct rt6_info *rt = (struct rt6_info *) dst; |