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 /include/net/route.h | |
| parent | 5df65e5567a497a28067019b8ff08f98fb026629 (diff) | |
| download | kernel_samsung_smdk4412-273447b352e69c327efdecfd6e1d6fe3edbdcd14.zip kernel_samsung_smdk4412-273447b352e69c327efdecfd6e1d6fe3edbdcd14.tar.gz kernel_samsung_smdk4412-273447b352e69c327efdecfd6e1d6fe3edbdcd14.tar.bz2 | |
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 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index 1be5c05..923e670 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); extern void rt_cache_flush_batch(struct net *net); extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp); extern int ip_route_output_key(struct net *, struct rtable **, struct flowi *flp); -extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, bool can_sleep); +extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk); extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src, u8 tos, struct net_device *devin, bool noref); @@ -198,7 +198,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, *rp = NULL; } security_sk_classify_flow(sk, &fl); - return ip_route_output_flow(net, rp, &fl, sk, can_sleep); + return ip_route_output_flow(net, rp, &fl, sk); } static inline int ip_route_newports(struct rtable **rp, u8 protocol, @@ -222,7 +222,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol, ip_rt_put(*rp); *rp = NULL; security_sk_classify_flow(sk, &fl); - return ip_route_output_flow(sock_net(sk), rp, &fl, sk, false); + return ip_route_output_flow(sock_net(sk), rp, &fl, sk); } return 0; } |