diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-01 14:27:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-01 14:27:04 -0800 |
| commit | 273447b352e69c327efdecfd6e1d6fe3edbdcd14 (patch) | |
| tree | dae1e0778ca973c25b74fd3dc9728616d6e65b73 /net/ipv4/route.c | |
| parent | 5df65e5567a497a28067019b8ff08f98fb026629 (diff) | |
| download | op-kernel-dev-273447b352e69c327efdecfd6e1d6fe3edbdcd14.zip op-kernel-dev-273447b352e69c327efdecfd6e1d6fe3edbdcd14.tar.gz | |
ipv4: Kill can_sleep arg to ip_route_output_flow()
This boolean state is now available in the flow flags.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 1ac3eca..7846265 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2720,7 +2720,7 @@ static int ipv4_dst_blackhole(struct net *net, struct rtable **rp, struct flowi } int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, - struct sock *sk, bool can_sleep) + struct sock *sk) { int err; @@ -2733,7 +2733,8 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, if (!flp->fl4_dst) flp->fl4_dst = (*rp)->rt_dst; err = __xfrm_lookup(net, (struct dst_entry **)rp, flp, sk, - can_sleep ? XFRM_LOOKUP_WAIT : 0); + ((flp->flags & FLOWI_FLAG_CAN_SLEEP) ? + XFRM_LOOKUP_WAIT : 0)); if (err == -EREMOTE) err = ipv4_dst_blackhole(net, rp, flp); @@ -2746,7 +2747,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow); int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp) { - return ip_route_output_flow(net, rp, flp, NULL, false); + return ip_route_output_flow(net, rp, flp, NULL); } EXPORT_SYMBOL(ip_route_output_key); |
