aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/route.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-01 17:19:23 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-01 17:19:23 -0500
commit420d44daa7aa1cc847e9e527f0a27a9ce61768ca (patch)
treea5aab8c6b925ba3da1079b7262f7d6c504406eb8 /include/net/route.h
parentabdf7e7239da270e68262728f125ea94b9b7d42d (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 'include/net/route.h')
-rw-r--r--include/net/route.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h
index 5e0826d1c0e0..6de4333d6002 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -120,7 +120,7 @@ extern void rt_cache_flush(struct net *net, int how);
120extern void rt_cache_flush_batch(struct net *net); 120extern void rt_cache_flush_batch(struct net *net);
121extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp); 121extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);
122extern int ip_route_output_key(struct net *, struct rtable **, struct flowi *flp); 122extern int ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
123extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags); 123extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, bool can_sleep);
124 124
125extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, 125extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
126 u8 tos, struct net_device *devin, bool noref); 126 u8 tos, struct net_device *devin, bool noref);
@@ -196,7 +196,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
196 *rp = NULL; 196 *rp = NULL;
197 } 197 }
198 security_sk_classify_flow(sk, &fl); 198 security_sk_classify_flow(sk, &fl);
199 return ip_route_output_flow(net, rp, &fl, sk, can_sleep ? 1 : 0); 199 return ip_route_output_flow(net, rp, &fl, sk, can_sleep);
200} 200}
201 201
202static inline int ip_route_newports(struct rtable **rp, u8 protocol, 202static inline int ip_route_newports(struct rtable **rp, u8 protocol,
@@ -220,7 +220,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol,
220 ip_rt_put(*rp); 220 ip_rt_put(*rp);
221 *rp = NULL; 221 *rp = NULL;
222 security_sk_classify_flow(sk, &fl); 222 security_sk_classify_flow(sk, &fl);
223 return ip_route_output_flow(sock_net(sk), rp, &fl, sk, 0); 223 return ip_route_output_flow(sock_net(sk), rp, &fl, sk, false);
224 } 224 }
225 return 0; 225 return 0;
226} 226}