diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-01 23:36:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-01 23:36:37 +0100 |
| commit | 80c0bc9e37adfc892af82cb6aa8cace79f8a96cb (patch) | |
| tree | 0f4abc233d9661e85c7c7ecb064a75a8f0984f1f /net/xfrm | |
| parent | ipv6: Change final dst lookup arg name to "can_sleep" (diff) | |
| download | linux-80c0bc9e37adfc892af82cb6aa8cace79f8a96cb.tar.xz linux-80c0bc9e37adfc892af82cb6aa8cace79f8a96cb.zip | |
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/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 41a91d27d3ea..f4c7467a614e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1831,7 +1831,7 @@ restart: XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTNOSTATES); return -EREMOTE; } - if (flags & XFRM_LOOKUP_WAIT) { + if (fl->flags & FLOWI_FLAG_CAN_SLEEP) { DECLARE_WAITQUEUE(wait, current); add_wait_queue(&net->xfrm.km_waitq, &wait); |