diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-01 17:19:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-01 17:19:23 -0500 |
commit | 420d44daa7aa1cc847e9e527f0a27a9ce61768ca (patch) | |
tree | a5aab8c6b925ba3da1079b7262f7d6c504406eb8 /net/ipv4/route.c | |
parent | abdf7e7239da270e68262728f125ea94b9b7d42d (diff) |
ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"
Since that is what the current vague "flags" argument means.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 52b077d45208..1ac3ecaf36e8 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 | |||
2720 | } | 2720 | } |
2721 | 2721 | ||
2722 | int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, | 2722 | int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, |
2723 | struct sock *sk, int flags) | 2723 | struct sock *sk, bool can_sleep) |
2724 | { | 2724 | { |
2725 | int err; | 2725 | int err; |
2726 | 2726 | ||
@@ -2733,7 +2733,7 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, | |||
2733 | if (!flp->fl4_dst) | 2733 | if (!flp->fl4_dst) |
2734 | flp->fl4_dst = (*rp)->rt_dst; | 2734 | flp->fl4_dst = (*rp)->rt_dst; |
2735 | err = __xfrm_lookup(net, (struct dst_entry **)rp, flp, sk, | 2735 | err = __xfrm_lookup(net, (struct dst_entry **)rp, flp, sk, |
2736 | flags ? XFRM_LOOKUP_WAIT : 0); | 2736 | can_sleep ? XFRM_LOOKUP_WAIT : 0); |
2737 | if (err == -EREMOTE) | 2737 | if (err == -EREMOTE) |
2738 | err = ipv4_dst_blackhole(net, rp, flp); | 2738 | err = ipv4_dst_blackhole(net, rp, flp); |
2739 | 2739 | ||
@@ -2746,7 +2746,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow); | |||
2746 | 2746 | ||
2747 | int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp) | 2747 | int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp) |
2748 | { | 2748 | { |
2749 | return ip_route_output_flow(net, rp, flp, NULL, 0); | 2749 | return ip_route_output_flow(net, rp, flp, NULL, false); |
2750 | } | 2750 | } |
2751 | EXPORT_SYMBOL(ip_route_output_key); | 2751 | EXPORT_SYMBOL(ip_route_output_key); |
2752 | 2752 | ||