diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-06 07:13:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:48:45 -0400 |
commit | db40980fcdb560d7992b0511df16cdd3f7e381f3 (patch) | |
tree | 337b5c41bd55915a4b894ea6fe09a865e7dcb0e4 /net/sctp/socket.c | |
parent | d61702f1273b71c2809365a7806d7fe84fd77f15 (diff) |
net: poll() optimizations
No need to test twice sk->sk_shutdown & RCV_SHUTDOWN
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index f4bec2772351..cf6dcc908b88 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -5707,13 +5707,12 @@ unsigned int sctp_poll(struct file *file, struct socket *sock, poll_table *wait) | |||
5707 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) | 5707 | if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) |
5708 | mask |= POLLERR; | 5708 | mask |= POLLERR; |
5709 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 5709 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
5710 | mask |= POLLRDHUP; | 5710 | mask |= POLLRDHUP | POLLIN | POLLRDNORM; |
5711 | if (sk->sk_shutdown == SHUTDOWN_MASK) | 5711 | if (sk->sk_shutdown == SHUTDOWN_MASK) |
5712 | mask |= POLLHUP; | 5712 | mask |= POLLHUP; |
5713 | 5713 | ||
5714 | /* Is it readable? Reconsider this code with TCP-style support. */ | 5714 | /* Is it readable? Reconsider this code with TCP-style support. */ |
5715 | if (!skb_queue_empty(&sk->sk_receive_queue) || | 5715 | if (!skb_queue_empty(&sk->sk_receive_queue)) |
5716 | (sk->sk_shutdown & RCV_SHUTDOWN)) | ||
5717 | mask |= POLLIN | POLLRDNORM; | 5716 | mask |= POLLIN | POLLRDNORM; |
5718 | 5717 | ||
5719 | /* The association is either gone or not ready. */ | 5718 | /* The association is either gone or not ready. */ |