diff options
| author | Benjamin LaHaise <benjamin.c.lahaise@intel.com> | 2005-12-13 23:22:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:10:44 -0800 |
| commit | c1cbe4b7ad0bc4b1d98ea708a3fecb7362aa4088 (patch) | |
| tree | 04ec26c728645dd1da2474b2b883a532b43811ad /net/irda | |
| parent | f1f71e03b17db3b9edb0264a8be7719bd5c35582 (diff) | |
| download | linux-3.10-c1cbe4b7ad0bc4b1d98ea708a3fecb7362aa4088.tar.gz linux-3.10-c1cbe4b7ad0bc4b1d98ea708a3fecb7362aa4088.tar.bz2 linux-3.10-c1cbe4b7ad0bc4b1d98ea708a3fecb7362aa4088.zip | |
[NET]: Avoid atomic xchg() for non-error case
It also looks like there were 2 places where the test on sk_err was
missing from the event wait logic (in sk_stream_wait_connect and
sk_stream_wait_memory), while the rest of the sock_error() users look
to be doing the right thing. This version of the patch fixes those,
and cleans up a few places that were testing ->sk_err directly.
Signed-off-by: Benjamin LaHaise <benjamin.c.lahaise@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/af_irda.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 6f92f9c6299..f121f7de203 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1438,8 +1438,9 @@ static int irda_recvmsg_stream(struct kiocb *iocb, struct socket *sock, /* * POSIX 1003.1g mandates this order. */ - if (sk->sk_err) - ret = sock_error(sk); + ret = sock_error(sk); + if (ret) + break; else if (sk->sk_shutdown & RCV_SHUTDOWN) ; else if (noblock) |