aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 77b1942f335b..b5f8769dbdf4 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1006,7 +1006,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
1006 * @sk: socket which provides route info 1006 * @sk: socket which provides route info
1007 * @fl: flow to lookup 1007 * @fl: flow to lookup
1008 * @final_dst: final destination address for ipsec lookup 1008 * @final_dst: final destination address for ipsec lookup
1009 * @want_blackhole: IPSEC blackhole handling desired 1009 * @can_sleep: we are in a sleepable context
1010 * 1010 *
1011 * This function performs a route lookup on the given flow. 1011 * This function performs a route lookup on the given flow.
1012 * 1012 *
@@ -1015,7 +1015,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup);
1015 */ 1015 */
1016struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl, 1016struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
1017 const struct in6_addr *final_dst, 1017 const struct in6_addr *final_dst,
1018 bool want_blackhole) 1018 bool can_sleep)
1019{ 1019{
1020 struct dst_entry *dst = NULL; 1020 struct dst_entry *dst = NULL;
1021 int err; 1021 int err;
@@ -1025,7 +1025,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
1025 return ERR_PTR(err); 1025 return ERR_PTR(err);
1026 if (final_dst) 1026 if (final_dst)
1027 ipv6_addr_copy(&fl->fl6_dst, final_dst); 1027 ipv6_addr_copy(&fl->fl6_dst, final_dst);
1028 if (want_blackhole) { 1028 if (can_sleep) {
1029 fl->flags |= FLOWI_FLAG_CAN_SLEEP; 1029 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
1030 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT); 1030 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
1031 if (err == -EREMOTE) 1031 if (err == -EREMOTE)
@@ -1046,7 +1046,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
1046 * @sk: socket which provides the dst cache and route info 1046 * @sk: socket which provides the dst cache and route info
1047 * @fl: flow to lookup 1047 * @fl: flow to lookup
1048 * @final_dst: final destination address for ipsec lookup 1048 * @final_dst: final destination address for ipsec lookup
1049 * @want_blackhole: IPSEC blackhole handling desired 1049 * @can_sleep: we are in a sleepable context
1050 * 1050 *
1051 * This function performs a route lookup on the given flow with the 1051 * This function performs a route lookup on the given flow with the
1052 * possibility of using the cached route in the socket if it is valid. 1052 * possibility of using the cached route in the socket if it is valid.
@@ -1058,7 +1058,7 @@ EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
1058 */ 1058 */
1059struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl, 1059struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
1060 const struct in6_addr *final_dst, 1060 const struct in6_addr *final_dst,
1061 bool want_blackhole) 1061 bool can_sleep)
1062{ 1062{
1063 struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie); 1063 struct dst_entry *dst = sk_dst_check(sk, inet6_sk(sk)->dst_cookie);
1064 int err; 1064 int err;
@@ -1070,7 +1070,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
1070 return ERR_PTR(err); 1070 return ERR_PTR(err);
1071 if (final_dst) 1071 if (final_dst)
1072 ipv6_addr_copy(&fl->fl6_dst, final_dst); 1072 ipv6_addr_copy(&fl->fl6_dst, final_dst);
1073 if (want_blackhole) { 1073 if (can_sleep) {
1074 fl->flags |= FLOWI_FLAG_CAN_SLEEP; 1074 fl->flags |= FLOWI_FLAG_CAN_SLEEP;
1075 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT); 1075 err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
1076 if (err == -EREMOTE) 1076 if (err == -EREMOTE)