summaryrefslogtreecommitdiffstats
path: root/net/ipv6
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/ipv6
parenta1414715f0ac905fb4b3a158ff6548d37bbe6165 (diff)
downloadlinux-stable-80c0bc9e37adfc892af82cb6aa8cace79f8a96cb.tar.gz
linux-stable-80c0bc9e37adfc892af82cb6aa8cace79f8a96cb.tar.bz2
linux-stable-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/ipv6')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index b5f8769dbdf4..faf7b9d1d536 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1027,7 +1027,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (can_sleep) {
fl->flags |= FLOWI_FLAG_CAN_SLEEP;
- err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
+ err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
if (err == -EREMOTE)
err = ip6_dst_blackhole(sk, &dst, fl);
if (err)
@@ -1072,7 +1072,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (can_sleep) {
fl->flags |= FLOWI_FLAG_CAN_SLEEP;
- err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
+ err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, 0);
if (err == -EREMOTE)
err = ip6_dst_blackhole(sk, &dst, fl);
if (err)