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/dccp/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/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 87c98fb86fa8..a08e2cb11915 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -994,7 +994,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, | |||
994 | if (final_p) | 994 | if (final_p) |
995 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 995 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
996 | 996 | ||
997 | err = __xfrm_lookup(&dst, &fl, sk, 1); | 997 | err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT); |
998 | if (err < 0) { | 998 | if (err < 0) { |
999 | if (err == -EREMOTE) | 999 | if (err == -EREMOTE) |
1000 | err = ip6_dst_blackhole(sk, &dst, &fl); | 1000 | err = ip6_dst_blackhole(sk, &dst, &fl); |