summaryrefslogtreecommitdiffstats
path: root/include/net/route.h
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2013-08-28 02:04:14 -0400
committerSteffen Klassert <steffen.klassert@secunet.com>2013-12-06 01:24:39 -0500
commit0e0d44ab4275549998567cd4700b43f7496eb62b (patch)
tree2b508851d3c8c76f7068c519e0b5c8ad31d21eec /include/net/route.h
parent5b8ef3415a21f173ab115e90ec92c071a03f22d7 (diff)
net: Remove FLOWI_FLAG_CAN_SLEEP
FLOWI_FLAG_CAN_SLEEP was used to notify xfrm about the posibility to sleep until the needed states are resolved. This code is gone, so FLOWI_FLAG_CAN_SLEEP is not needed anymore. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net/route.h')
-rw-r--r--include/net/route.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/net/route.h b/include/net/route.h
index f68c167280a7..638e3ebf76f3 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -239,14 +239,12 @@ static inline char rt_tos2priority(u8 tos)
239static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 src, 239static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32 src,
240 u32 tos, int oif, u8 protocol, 240 u32 tos, int oif, u8 protocol,
241 __be16 sport, __be16 dport, 241 __be16 sport, __be16 dport,
242 struct sock *sk, bool can_sleep) 242 struct sock *sk)
243{ 243{
244 __u8 flow_flags = 0; 244 __u8 flow_flags = 0;
245 245
246 if (inet_sk(sk)->transparent) 246 if (inet_sk(sk)->transparent)
247 flow_flags |= FLOWI_FLAG_ANYSRC; 247 flow_flags |= FLOWI_FLAG_ANYSRC;
248 if (can_sleep)
249 flow_flags |= FLOWI_FLAG_CAN_SLEEP;
250 248
251 flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, 249 flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
252 protocol, flow_flags, dst, src, dport, sport); 250 protocol, flow_flags, dst, src, dport, sport);
@@ -256,13 +254,13 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
256 __be32 dst, __be32 src, u32 tos, 254 __be32 dst, __be32 src, u32 tos,
257 int oif, u8 protocol, 255 int oif, u8 protocol,
258 __be16 sport, __be16 dport, 256 __be16 sport, __be16 dport,
259 struct sock *sk, bool can_sleep) 257 struct sock *sk)
260{ 258{
261 struct net *net = sock_net(sk); 259 struct net *net = sock_net(sk);
262 struct rtable *rt; 260 struct rtable *rt;
263 261
264 ip_route_connect_init(fl4, dst, src, tos, oif, protocol, 262 ip_route_connect_init(fl4, dst, src, tos, oif, protocol,
265 sport, dport, sk, can_sleep); 263 sport, dport, sk);
266 264
267 if (!dst || !src) { 265 if (!dst || !src) {
268 rt = __ip_route_output_key(net, fl4); 266 rt = __ip_route_output_key(net, fl4);