aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-12 21:48:58 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:57:42 -0500
commitbb72845e699d3c84e5f861b51db686107a51dea5 (patch)
treea4a84343cbcc96e86c83954dc82f2a5ee0ce787d /net/ipv6/raw.c
parent7233b9f33e72ca477034ff5cf901c89efba3a5bc (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/raw.c')
-rw-r--r--net/ipv6/raw.c2
1 files changed, 1 insertions, 1 deletions
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)