summaryrefslogtreecommitdiffstats
path: root/net/decnet
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/decnet
parent7233b9f33e72ca477034ff5cf901c89efba3a5bc (diff)
downloadlinux-stable-bb72845e699d3c84e5f861b51db686107a51dea5.tar.gz
linux-stable-bb72845e699d3c84e5f861b51db686107a51dea5.tar.bz2
linux-stable-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/decnet')
-rw-r--r--net/decnet/dn_route.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 5d742f1420d9..73a13075b7ee 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1196,7 +1196,8 @@ int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock
err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
if (err == 0 && fl->proto) {
- err = xfrm_lookup(pprt, fl, sk, !(flags & MSG_DONTWAIT));
+ err = xfrm_lookup(pprt, fl, sk, (flags & MSG_DONTWAIT) ?
+ XFRM_LOOKUP_WAIT : 0);
}
return err;
}