aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-12-12 21:48:58 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:57:42 -0500
commitbb72845e699d3c84e5f861b51db686107a51dea5 (patch)
treea4a84343cbcc96e86c83954dc82f2a5ee0ce787d /net/ipv4/route.c
parent7233b9f33e72ca477034ff5cf901c89efba3a5bc (diff)
[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/ipv4/route.c')
-rw-r--r--net/ipv4/route.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index b576f8cd401..1b70ffd1261 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2536,7 +2536,8 @@ int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk,
2536 flp->fl4_src = (*rp)->rt_src; 2536 flp->fl4_src = (*rp)->rt_src;
2537 if (!flp->fl4_dst) 2537 if (!flp->fl4_dst)
2538 flp->fl4_dst = (*rp)->rt_dst; 2538 flp->fl4_dst = (*rp)->rt_dst;
2539 err = __xfrm_lookup((struct dst_entry **)rp, flp, sk, flags); 2539 err = __xfrm_lookup((struct dst_entry **)rp, flp, sk,
2540 flags ? XFRM_LOOKUP_WAIT : 0);
2540 if (err == -EREMOTE) 2541 if (err == -EREMOTE)
2541 err = ipv4_dst_blackhole(rp, flp, sk); 2542 err = ipv4_dst_blackhole(rp, flp, sk);
2542 2543