GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "net: simplify sock_poll_wait"

Browse source 
This reverts commit dd979b4df8.

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>
This commit is contained in:
Karsten Graul 2018-10-23 13:40:39 +02:00 • committed by David S. Miller
parent 6b7a02f708
commit 89ab066d42
13 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/unix/af_unix.c
View file

@ -2642,7 +2642,7 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
struct sock *sk = sock->sk;
__poll_t mask;
sock_poll_wait(file, wait);
sock_poll_wait(file, sock, wait);
mask = 0;
/* exceptional events? */
@ -2679,7 +2679,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
unsigned int writable;
__poll_t mask;
sock_poll_wait(file, wait);
sock_poll_wait(file, sock, wait);
mask = 0;
/* exceptional events? */