aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-01 14:22:19 -0800
committerDavid S. Miller <davem@davemloft.net>2011-03-01 14:22:19 -0800
commit5df65e5567a497a28067019b8ff08f98fb026629 (patch)
tree776a8a2cfa2cf5962ea0d53dea8c6c8360a0c58d /net/ipv6
parent420d44daa7aa1cc847e9e527f0a27a9ce61768ca (diff)
downloadkernel_samsung_aries-5df65e5567a497a28067019b8ff08f98fb026629.zip
kernel_samsung_aries-5df65e5567a497a28067019b8ff08f98fb026629.tar.gz
kernel_samsung_aries-5df65e5567a497a28067019b8ff08f98fb026629.tar.bz2
net: Add FLOWI_FLAG_CAN_SLEEP.
And set is in contexts where the route resolution can sleep. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_output.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 28209b2..77b1942 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1026,6 +1026,7 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi *fl,
if (final_dst)
ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (want_blackhole) {
+ fl->flags |= FLOWI_FLAG_CAN_SLEEP;
err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
if (err == -EREMOTE)
err = ip6_dst_blackhole(sk, &dst, fl);
@@ -1070,6 +1071,7 @@ struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi *fl,
if (final_dst)
ipv6_addr_copy(&fl->fl6_dst, final_dst);
if (want_blackhole) {
+ fl->flags |= FLOWI_FLAG_CAN_SLEEP;
err = __xfrm_lookup(sock_net(sk), &dst, fl, sk, XFRM_LOOKUP_WAIT);
if (err == -EREMOTE)
err = ip6_dst_blackhole(sk, &dst, fl);