diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/datagram.c | 2 | ||||
-rw-r--r-- | net/ipv6/raw.c | 2 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
-rw-r--r-- | net/ipv6/udp.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 5d4245ab4183..f49a06aa97de 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c | |||
@@ -177,7 +177,7 @@ ipv4_connected: | |||
177 | if (final_p) | 177 | if (final_p) |
178 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 178 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
179 | 179 | ||
180 | if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) { | 180 | if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) { |
181 | if (err == -EREMOTE) | 181 | if (err == -EREMOTE) |
182 | err = ip6_dst_blackhole(sk, &dst, &fl); | 182 | err = ip6_dst_blackhole(sk, &dst, &fl); |
183 | if (err < 0) | 183 | if (err < 0) |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 850b83e430bc..2663fd1323e4 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -871,7 +871,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, | |||
871 | if (final_p) | 871 | if (final_p) |
872 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 872 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
873 | 873 | ||
874 | if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) { | 874 | if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) { |
875 | if (err == -EREMOTE) | 875 | if (err == -EREMOTE) |
876 | err = ip6_dst_blackhole(sk, &dst, &fl); | 876 | err = ip6_dst_blackhole(sk, &dst, &fl); |
877 | if (err < 0) | 877 | if (err < 0) |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 9544beb6d1ca..0ef99864ef8a 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -265,7 +265,7 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | |||
265 | if (final_p) | 265 | if (final_p) |
266 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 266 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
267 | 267 | ||
268 | if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) { | 268 | if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) { |
269 | if (err == -EREMOTE) | 269 | if (err == -EREMOTE) |
270 | err = ip6_dst_blackhole(sk, &dst, &fl); | 270 | err = ip6_dst_blackhole(sk, &dst, &fl); |
271 | if (err < 0) | 271 | if (err < 0) |
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 1e3bd39f54ec..8cbdcc9602df 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -757,7 +757,7 @@ do_udp_sendmsg: | |||
757 | if (final_p) | 757 | if (final_p) |
758 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 758 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
759 | 759 | ||
760 | if ((err = __xfrm_lookup(&dst, &fl, sk, 1)) < 0) { | 760 | if ((err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT)) < 0) { |
761 | if (err == -EREMOTE) | 761 | if (err == -EREMOTE) |
762 | err = ip6_dst_blackhole(sk, &dst, &fl); | 762 | err = ip6_dst_blackhole(sk, &dst, &fl); |
763 | if (err < 0) | 763 | if (err < 0) |