|
@@ -726,11 +726,11 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
|
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
switch (sk->sk_state) {
|
|
|
case TIPC_ESTABLISHED:
|
|
case TIPC_ESTABLISHED:
|
|
|
- case TIPC_CONNECTING:
|
|
|
|
|
if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
|
|
if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
|
|
|
revents |= EPOLLOUT;
|
|
revents |= EPOLLOUT;
|
|
|
/* fall thru' */
|
|
/* fall thru' */
|
|
|
case TIPC_LISTEN:
|
|
case TIPC_LISTEN:
|
|
|
|
|
+ case TIPC_CONNECTING:
|
|
|
if (!skb_queue_empty(&sk->sk_receive_queue))
|
|
if (!skb_queue_empty(&sk->sk_receive_queue))
|
|
|
revents |= EPOLLIN | EPOLLRDNORM;
|
|
revents |= EPOLLIN | EPOLLRDNORM;
|
|
|
break;
|
|
break;
|
|
@@ -2039,7 +2039,7 @@ static bool tipc_sk_filter_connect(struct tipc_sock *tsk, struct sk_buff *skb)
|
|
|
return true;
|
|
return true;
|
|
|
|
|
|
|
|
/* If empty 'ACK-' message, wake up sleeping connect() */
|
|
/* If empty 'ACK-' message, wake up sleeping connect() */
|
|
|
- sk->sk_data_ready(sk);
|
|
|
|
|
|
|
+ sk->sk_state_change(sk);
|
|
|
|
|
|
|
|
/* 'ACK-' message is neither accepted nor rejected: */
|
|
/* 'ACK-' message is neither accepted nor rejected: */
|
|
|
msg_set_dest_droppable(hdr, 1);
|
|
msg_set_dest_droppable(hdr, 1);
|