diff options
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index b5f8769dbdf4..faf7b9d1d536 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -1027,7 +1027,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl, | |||
| 1027 | ipv6_addr_copy(&fl->fl6_dst, final_dst); | 1027 | ipv6_addr_copy(&fl->fl6_dst, final_dst); |
| 1028 | if (can_sleep) { | 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, 0); |
| 1031 | if (err == -EREMOTE) | 1031 | if (err == -EREMOTE) |
| 1032 | err = ip6_dst_blackhole(sk, &dst, fl); | 1032 | err = ip6_dst_blackhole(sk, &dst, fl); |
| 1033 | if (err) | 1033 | if (err) |
| @@ -1072,7 +1072,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl, | |||
| 1072 | ipv6_addr_copy(&fl->fl6_dst, final_dst); | 1072 | ipv6_addr_copy(&fl->fl6_dst, final_dst); |
| 1073 | if (can_sleep) { | 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, 0); |
| 1076 | if (err == -EREMOTE) | 1076 | if (err == -EREMOTE) |
| 1077 | err = ip6_dst_blackhole(sk, &dst, fl); | 1077 | err = ip6_dst_blackhole(sk, &dst, fl); |
| 1078 | if (err) | 1078 | if (err) |