summaryrefslogtreecommitdiffstats
path: root/net/iucv
diff options
context:
space:
mode:
authorKarsten Graul <kgraul@linux.ibm.com>2018-10-23 13:40:39 +0200
committerDavid S. Miller <davem@davemloft.net>2018-10-23 10:57:06 -0700
commit89ab066d4229acd32e323f1569833302544a4186 (patch)
tree8ac41f577d2c524fe0254a23b91144c624c34af4 /net/iucv
parent6b7a02f7089b223317bf264b8fdfdaf74be35b5f (diff)
downloadlinux-stable-89ab066d4229acd32e323f1569833302544a4186.tar.gz
linux-stable-89ab066d4229acd32e323f1569833302544a4186.tar.bz2
linux-stable-89ab066d4229acd32e323f1569833302544a4186.zip
Revert "net: simplify sock_poll_wait"
This reverts commit dd979b4df817e9976f18fb6f9d134d6bc4a3c317. This broke tcp_poll for SMC fallback: An AF_SMC socket establishes an internal TCP socket for the initial handshake with the remote peer. Whenever the SMC connection can not be established this TCP socket is used as a fallback. All socket operations on the SMC socket are then forwarded to the TCP socket. In case of poll, the file->private_data pointer references the SMC socket because the TCP socket has no file assigned. This causes tcp_poll to wait on the wrong socket. Signed-off-by: Karsten Graul <kgraul@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv')
-rw-r--r--net/iucv/af_iucv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 45115c125569..0bed4cc20603 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1504,7 +1504,7 @@ __poll_t iucv_sock_poll(struct file *file, struct socket *sock,
struct sock *sk = sock->sk;
__poll_t mask = 0;
- sock_poll_wait(file, wait);
+ sock_poll_wait(file, sock, wait);
if (sk->sk_state == IUCV_LISTEN)
return iucv_accept_poll(sk);