diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/socket.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 163f3a547501..b0323ec7971e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
@@ -721,31 +721,31 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock, | |||
721 | sock_poll_wait(file, sk_sleep(sk), wait); | 721 | sock_poll_wait(file, sk_sleep(sk), wait); |
722 | 722 | ||
723 | if (sk->sk_shutdown & RCV_SHUTDOWN) | 723 | if (sk->sk_shutdown & RCV_SHUTDOWN) |
724 | revents |= POLLRDHUP | POLLIN | POLLRDNORM; | 724 | revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM; |
725 | if (sk->sk_shutdown == SHUTDOWN_MASK) | 725 | if (sk->sk_shutdown == SHUTDOWN_MASK) |
726 | revents |= POLLHUP; | 726 | revents |= EPOLLHUP; |
727 | 727 | ||
728 | switch (sk->sk_state) { | 728 | switch (sk->sk_state) { |
729 | case TIPC_ESTABLISHED: | 729 | case TIPC_ESTABLISHED: |
730 | case TIPC_CONNECTING: | 730 | case TIPC_CONNECTING: |
731 | if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk)) | 731 | if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk)) |
732 | revents |= POLLOUT; | 732 | revents |= EPOLLOUT; |
733 | /* fall thru' */ | 733 | /* fall thru' */ |
734 | case TIPC_LISTEN: | 734 | case TIPC_LISTEN: |
735 | if (!skb_queue_empty(&sk->sk_receive_queue)) | 735 | if (!skb_queue_empty(&sk->sk_receive_queue)) |
736 | revents |= POLLIN | POLLRDNORM; | 736 | revents |= EPOLLIN | EPOLLRDNORM; |
737 | break; | 737 | break; |
738 | case TIPC_OPEN: | 738 | case TIPC_OPEN: |
739 | if (tsk->group_is_open && !tsk->cong_link_cnt) | 739 | if (tsk->group_is_open && !tsk->cong_link_cnt) |
740 | revents |= POLLOUT; | 740 | revents |= EPOLLOUT; |
741 | if (!tipc_sk_type_connectionless(sk)) | 741 | if (!tipc_sk_type_connectionless(sk)) |
742 | break; | 742 | break; |
743 | if (skb_queue_empty(&sk->sk_receive_queue)) | 743 | if (skb_queue_empty(&sk->sk_receive_queue)) |
744 | break; | 744 | break; |
745 | revents |= POLLIN | POLLRDNORM; | 745 | revents |= EPOLLIN | EPOLLRDNORM; |
746 | break; | 746 | break; |
747 | case TIPC_DISCONNECTING: | 747 | case TIPC_DISCONNECTING: |
748 | revents = POLLIN | POLLRDNORM | POLLHUP; | 748 | revents = EPOLLIN | EPOLLRDNORM | EPOLLHUP; |
749 | break; | 749 | break; |
750 | } | 750 | } |
751 | return revents; | 751 | return revents; |
@@ -1897,8 +1897,8 @@ static void tipc_write_space(struct sock *sk) | |||
1897 | rcu_read_lock(); | 1897 | rcu_read_lock(); |
1898 | wq = rcu_dereference(sk->sk_wq); | 1898 | wq = rcu_dereference(sk->sk_wq); |
1899 | if (skwq_has_sleeper(wq)) | 1899 | if (skwq_has_sleeper(wq)) |
1900 | wake_up_interruptible_sync_poll(&wq->wait, POLLOUT | | 1900 | wake_up_interruptible_sync_poll(&wq->wait, EPOLLOUT | |
1901 | POLLWRNORM | POLLWRBAND); | 1901 | EPOLLWRNORM | EPOLLWRBAND); |
1902 | rcu_read_unlock(); | 1902 | rcu_read_unlock(); |
1903 | } | 1903 | } |
1904 | 1904 | ||
@@ -1914,8 +1914,8 @@ static void tipc_data_ready(struct sock *sk) | |||
1914 | rcu_read_lock(); | 1914 | rcu_read_lock(); |
1915 | wq = rcu_dereference(sk->sk_wq); | 1915 | wq = rcu_dereference(sk->sk_wq); |
1916 | if (skwq_has_sleeper(wq)) | 1916 | if (skwq_has_sleeper(wq)) |
1917 | wake_up_interruptible_sync_poll(&wq->wait, POLLIN | | 1917 | wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN | |
1918 | POLLRDNORM | POLLRDBAND); | 1918 | EPOLLRDNORM | EPOLLRDBAND); |
1919 | rcu_read_unlock(); | 1919 | rcu_read_unlock(); |
1920 | } | 1920 | } |
1921 | 1921 | ||