summaryrefslogtreecommitdiff
path: root/net/dccp
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-12 18:48:58 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:42 -0800
commitbb72845e699d3c84e5f861b51db686107a51dea5 (patch)
treea4a84343cbcc96e86c83954dc82f2a5ee0ce787d /net/dccp
parent7233b9f33e72ca477034ff5cf901c89efba3a5bc (diff)
downloadlinux-3.10-bb72845e699d3c84e5f861b51db686107a51dea5.tar.gz
linux-3.10-bb72845e699d3c84e5f861b51db686107a51dea5.tar.bz2
linux-3.10-bb72845e699d3c84e5f861b51db686107a51dea5.zip
[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')
-rw-r--r--net/dccp/ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 87c98fb86fa..a08e2cb1191 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,
if (final_p)
ipv6_addr_copy(&fl.fl6_dst, final_p);
- err = __xfrm_lookup(&dst, &fl, sk, 1);
+ err = __xfrm_lookup(&dst, &fl, sk, XFRM_LOOKUP_WAIT);
if (err < 0) {
if (err == -EREMOTE)
err = ip6_dst_blackhole(sk, &dst, &fl);