diff options
Diffstat (limited to 'include/net/ip6_route.h')
-rw-r--r-- | include/net/ip6_route.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 249ce4545ef0..0d40f84df21b 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -144,21 +144,24 @@ extern rwlock_t rt6_lock; | |||
144 | * Store a destination cache entry in a socket | 144 | * Store a destination cache entry in a socket |
145 | */ | 145 | */ |
146 | static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst, | 146 | static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst, |
147 | struct in6_addr *daddr) | 147 | struct in6_addr *daddr, struct in6_addr *saddr) |
148 | { | 148 | { |
149 | struct ipv6_pinfo *np = inet6_sk(sk); | 149 | struct ipv6_pinfo *np = inet6_sk(sk); |
150 | struct rt6_info *rt = (struct rt6_info *) dst; | 150 | struct rt6_info *rt = (struct rt6_info *) dst; |
151 | 151 | ||
152 | sk_setup_caps(sk, dst); | 152 | sk_setup_caps(sk, dst); |
153 | np->daddr_cache = daddr; | 153 | np->daddr_cache = daddr; |
154 | #ifdef CONFIG_IPV6_SUBTREES | ||
155 | np->saddr_cache = saddr; | ||
156 | #endif | ||
154 | np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; | 157 | np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0; |
155 | } | 158 | } |
156 | 159 | ||
157 | static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst, | 160 | static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst, |
158 | struct in6_addr *daddr) | 161 | struct in6_addr *daddr, struct in6_addr *saddr) |
159 | { | 162 | { |
160 | write_lock(&sk->sk_dst_lock); | 163 | write_lock(&sk->sk_dst_lock); |
161 | __ip6_dst_store(sk, dst, daddr); | 164 | __ip6_dst_store(sk, dst, daddr, saddr); |
162 | write_unlock(&sk->sk_dst_lock); | 165 | write_unlock(&sk->sk_dst_lock); |
163 | } | 166 | } |
164 | 167 | ||