diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-12 21:48:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:42 -0500 |
commit | bb72845e699d3c84e5f861b51db686107a51dea5 (patch) | |
tree | a4a84343cbcc96e86c83954dc82f2a5ee0ce787d /net/ipv6/tcp_ipv6.c | |
parent | 7233b9f33e72ca477034ff5cf901c89efba3a5bc (diff) |
[IPSEC]: Make callers of xfrm_lookup to use XFRM_LOOKUP_WAIT
This patch converts all callers of xfrm_lookup that used an
explicit value of 1 to indiciate blocking to use the new flag
XFRM_LOOKUP_WAIT.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |