aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r--net/tipc/socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 145e4decb0c9..dd8537f988c4 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -736,11 +736,11 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
736 736
737 switch (sk->sk_state) { 737 switch (sk->sk_state) {
738 case TIPC_ESTABLISHED: 738 case TIPC_ESTABLISHED:
739 case TIPC_CONNECTING:
740 if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk)) 739 if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
741 revents |= EPOLLOUT; 740 revents |= EPOLLOUT;
742 /* fall through */ 741 /* fall through */
743 case TIPC_LISTEN: 742 case TIPC_LISTEN:
743 case TIPC_CONNECTING:
744 if (!skb_queue_empty(&sk->sk_receive_queue)) 744 if (!skb_queue_empty(&sk->sk_receive_queue))
745 revents |= EPOLLIN | EPOLLRDNORM; 745 revents |= EPOLLIN | EPOLLRDNORM;
746 break; 746 break;
@@ -2043,7 +2043,7 @@ static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb)
2043 if (msg_data_sz(hdr)) 2043 if (msg_data_sz(hdr))
2044 return true; 2044 return true;
2045 /* Empty ACK-, - wake up sleeping connect() and drop */ 2045 /* Empty ACK-, - wake up sleeping connect() and drop */
2046 sk->sk_data_ready(sk); 2046 sk->sk_state_change(sk);
2047 msg_set_dest_droppable(hdr, 1); 2047 msg_set_dest_droppable(hdr, 1);
2048 return false; 2048 return false;
2049 } 2049 }