diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:48:07 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:48:07 -0400 |
| commit | 907c462cad21e59b28fd8af02e85300a8d3a85c7 (patch) | |
| tree | ceab6caefc753c5363e057cba4a8fba271ae0f52 | |
| parent | 87c89877792b10c9b0cfd1fd9d4a2f6373546086 (diff) | |
| download | longterm-queue-4.12-907c462cad21e59b28fd8af02e85300a8d3a85c7.tar.gz | |
tipc: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tipc-fix-hanging-poll-for-stream-sockets.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/tipc-fix-hanging-poll-for-stream-sockets.patch b/queue/tipc-fix-hanging-poll-for-stream-sockets.patch index fb91e5d..99b5ddf 100644 --- a/queue/tipc-fix-hanging-poll-for-stream-sockets.patch +++ b/queue/tipc-fix-hanging-poll-for-stream-sockets.patch @@ -1,4 +1,4 @@ -From 517d7c79bdb39864e617960504bdc1aa560c75c6 Mon Sep 17 00:00:00 2001 +From 9f2c4992da4321e9d8fbe20c3e297f53f49ad3c3 Mon Sep 17 00:00:00 2001 From: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@gmail.com> Date: Thu, 28 Dec 2017 12:03:06 +0100 Subject: [PATCH] tipc: fix hanging poll() for stream sockets @@ -20,23 +20,24 @@ Fixes: 42b531de17d2f6 ("tipc: Fix missing connection request handling") Acked-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/tipc/socket.c b/net/tipc/socket.c -index 41127d0b925e..3b4084480377 100644 +index a0f50278901b..c1b5101a2092 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c -@@ -727,11 +727,11 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock, +@@ -709,11 +709,11 @@ static unsigned int tipc_poll(struct file *file, struct socket *sock, switch (sk->sk_state) { case TIPC_ESTABLISHED: + case TIPC_CONNECTING: if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk)) - revents |= POLLOUT; + mask |= POLLOUT; /* fall thru' */ case TIPC_LISTEN: - case TIPC_CONNECTING: if (!skb_queue_empty(&sk->sk_receive_queue)) - revents |= POLLIN | POLLRDNORM; + mask |= (POLLIN | POLLRDNORM); break; -- 2.15.0 |