aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv6.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-02-08 05:09:21 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-08 15:38:45 -0500
commit8eb9086f21c73b38b5ca27558db4c91d62d0e70b (patch)
tree1fa2694f1e5eac966cc8db2fb8d5f3d684b09803 /net/dccp/ipv6.c
parentba7808eac17360dda459f82222859b0e3879854b (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/dccp/ipv6.c')
-rw-r--r--net/dccp/ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 6b91a9dd0411..79140b3e592e 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1041,7 +1041,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
1041 if (final_p) 1041 if (final_p)
1042 ipv6_addr_copy(&fl.fl6_dst, final_p); 1042 ipv6_addr_copy(&fl.fl6_dst, final_p);
1043 1043
1044 err = xfrm_lookup(&dst, &fl, sk, 0); 1044 err = xfrm_lookup(&dst, &fl, sk, 1);
1045 if (err < 0) 1045 if (err < 0)
1046 goto failure; 1046 goto failure;
1047 1047