diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 10:09:21 (GMT) |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 20:38:45 (GMT) |
commit | 8eb9086f21c73b38b5ca27558db4c91d62d0e70b (patch) | |
tree | 1fa2694f1e5eac966cc8db2fb8d5f3d684b09803 /net/ipv6/datagram.c | |
parent | ba7808eac17360dda459f82222859b0e3879854b (diff) | |
download | linux-8eb9086f21c73b38b5ca27558db4c91d62d0e70b.tar.xz |
[IPV4/IPV6]: Always wait for IPSEC SA resolution in socket contexts.
Do this even for non-blocking sockets. This avoids the silly -EAGAIN
that applications can see now, even for non-blocking sockets in some
cases (f.e. connect()).
With help from Venkat Tekkirala.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
-rw-r--r-- | net/ipv6/datagram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 5c94fea..ecde301 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -178,7 +178,7 @@ ipv4_connected: if (final_p) ipv6_addr_copy(&fl.fl6_dst, final_p); - if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0) + if ((err = xfrm_lookup(&dst, &fl, sk, 1)) < 0) goto out; /* source address lookup done in ip6_dst_lookup */ |