diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-01 17:15:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-01 17:15:24 -0500 |
commit | abdf7e7239da270e68262728f125ea94b9b7d42d (patch) | |
tree | 30c1246fac76ad7a4d2b1f8dcf3698b4d302b4de /include/net/route.h | |
parent | 68d0c6d34d586a893292d4fb633a3bf8c547b222 (diff) |
ipv4: Can final ip_route_connect() arg to boolean "can_sleep".
Since that's what the current vague "flags" thing means.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/route.h')
-rw-r--r-- | include/net/route.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index b3f89ad04e0b..5e0826d1c0e0 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -168,7 +168,7 @@ static inline char rt_tos2priority(u8 tos) | |||
168 | static inline int ip_route_connect(struct rtable **rp, __be32 dst, | 168 | static inline int ip_route_connect(struct rtable **rp, __be32 dst, |
169 | __be32 src, u32 tos, int oif, u8 protocol, | 169 | __be32 src, u32 tos, int oif, u8 protocol, |
170 | __be16 sport, __be16 dport, struct sock *sk, | 170 | __be16 sport, __be16 dport, struct sock *sk, |
171 | int flags) | 171 | bool can_sleep) |
172 | { | 172 | { |
173 | struct flowi fl = { .oif = oif, | 173 | struct flowi fl = { .oif = oif, |
174 | .mark = sk->sk_mark, | 174 | .mark = sk->sk_mark, |
@@ -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, flags); | 199 | return ip_route_output_flow(net, rp, &fl, sk, can_sleep ? 1 : 0); |
200 | } | 200 | } |
201 | 201 | ||
202 | static inline int ip_route_newports(struct rtable **rp, u8 protocol, | 202 | static inline int ip_route_newports(struct rtable **rp, u8 protocol, |