mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Revert "net: simplify sock_poll_wait"
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
6b7a02f708
commit
89ab066d42
13 changed files with 22 additions and 16 deletions
|
|
@ -1071,7 +1071,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock,
|
|||
struct af_alg_ctx *ctx = ask->private;
|
||||
__poll_t mask;
|
||||
|
||||
sock_poll_wait(file, wait);
|
||||
sock_poll_wait(file, sock, wait);
|
||||
mask = 0;
|
||||
|
||||
if (!ctx->more || ctx->used)
|
||||
|
|
|
|||
Loading…
Reference in a new issue