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/ipv6/raw.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/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 4ae1b19ada5d..f2e883c9368a 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -815,7 +815,7 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, | |||
| 815 | if (final_p) | 815 | if (final_p) |
| 816 | ipv6_addr_copy(&fl.fl6_dst, final_p); | 816 | ipv6_addr_copy(&fl.fl6_dst, final_p); |
| 817 | 817 | ||
| 818 | if ((err = xfrm_lookup(&dst, &fl, sk, 0)) < 0) | 818 | if ((err = xfrm_lookup(&dst, &fl, sk, 1)) < 0) |
| 819 | goto out; | 819 | goto out; |
| 820 | 820 | ||
| 821 | if (hlimit < 0) { | 821 | if (hlimit < 0) { |