diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 05:09:21 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 15:38:45 -0500 |
commit | 8eb9086f21c73b38b5ca27558db4c91d62d0e70b (patch) | |
tree | 1fa2694f1e5eac966cc8db2fb8d5f3d684b09803 /net/ipv4/af_inet.c | |
parent | ba7808eac17360dda459f82222859b0e3879854b (diff) |
[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/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 864009643675..5750a2b2a0d6 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -1007,7 +1007,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) | |||
1007 | RT_CONN_FLAGS(sk), | 1007 | RT_CONN_FLAGS(sk), |
1008 | sk->sk_bound_dev_if, | 1008 | sk->sk_bound_dev_if, |
1009 | sk->sk_protocol, | 1009 | sk->sk_protocol, |
1010 | inet->sport, inet->dport, sk); | 1010 | inet->sport, inet->dport, sk, 0); |
1011 | if (err) | 1011 | if (err) |
1012 | return err; | 1012 | return err; |
1013 | 1013 | ||