aboutsummaryrefslogtreecommitdiff
path: root/net/decnet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-01 14:36:37 -0800
committerDavid S. Miller <davem@davemloft.net>2011-03-01 14:36:37 -0800
commit80c0bc9e37adfc892af82cb6aa8cace79f8a96cb (patch)
tree0f4abc233d9661e85c7c7ecb064a75a8f0984f1f /net/decnet
parenta1414715f0ac905fb4b3a158ff6548d37bbe6165 (diff)
xfrm: Kill XFRM_LOOKUP_WAIT flag.
This can be determined from the flow flags instead. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/dn_route.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 06c054d5ccb..0877147d216 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1233,8 +1233,9 @@ 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(&init_net, pprt, fl, sk,
- (flags & MSG_DONTWAIT) ? 0 : XFRM_LOOKUP_WAIT);
+ if (!(flags & MSG_DONTWAIT))
+ fl->flags |= FLOWI_FLAG_CAN_SLEEP;
+ err = xfrm_lookup(&init_net, pprt, fl, sk, 0);
}
return err;
}