diff options
| author | Karsten Graul | 2018-10-23 13:40:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-04 14:50:51 +0100 |
| commit | fd54c188b3391acc9a9bba329b10d4965e0ab812 (patch) | |
| tree | 454d9ef9cb4d545fa99ff1162542ee905d49f624 /net/caif | |
| parent | net: udp: fix handling of CHECKSUM_COMPLETE packets (diff) | |
| download | kernel-qcow2-linux-fd54c188b3391acc9a9bba329b10d4965e0ab812.tar.gz kernel-qcow2-linux-fd54c188b3391acc9a9bba329b10d4965e0ab812.tar.xz kernel-qcow2-linux-fd54c188b3391acc9a9bba329b10d4965e0ab812.zip | |
Revert "net: simplify sock_poll_wait"
[ Upstream commit 89ab066d4229acd32e323f1569833302544a4186 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/caif')
| -rw-r--r-- | net/caif/caif_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index d18965f3291f..416717c57cd1 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -941,7 +941,7 @@ static __poll_t caif_poll(struct file *file, __poll_t mask; struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); - sock_poll_wait(file, wait); + sock_poll_wait(file, sock, wait); mask = 0; /* exceptional events? */ |