diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-02 01:36:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-02 01:36:37 +0300 |
| commit | 80c0bc9e37adfc892af82cb6aa8cace79f8a96cb (patch) | |
| tree | 0f4abc233d9661e85c7c7ecb064a75a8f0984f1f /net/decnet | |
| parent | a1414715f0ac905fb4b3a158ff6548d37bbe6165 (diff) | |
| download | linux-80c0bc9e37adfc892af82cb6aa8cace79f8a96cb.tar.xz | |
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 06c054d5ccba..0877147d2167 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; } |