diff mbox series

squash-to: "mptcp: add subflow write space signalling and mptcp_poll"

Message ID 509ec2d23608193d8f9958b9f3744d1d263de779.1576252967.git.dcaratti@redhat.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series squash-to: "mptcp: add subflow write space signalling and mptcp_poll" | expand

Commit Message

Davide Caratti Dec. 13, 2019, 4:05 p.m. UTC
checkpatch fixes

Signed-off-by: Davide Caratti<dcaratti@redhat.com>
---
 net/mptcp/protocol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Paolo Abeni Dec. 13, 2019, 4:11 p.m. UTC | #1
On Fri, 2019-12-13 at 17:05 +0100, Davide Caratti wrote:
> checkpatch fixes
> 
> Signed-off-by: Davide Caratti<dcaratti@redhat.com>
> ---
>  net/mptcp/protocol.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 71a305f391c4..44e6f0d1070c 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -817,7 +817,8 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock,
>  
>  	if (test_bit(MPTCP_DATA_READY, &msk->flags))
>  		mask = EPOLLIN | EPOLLRDNORM;
> -	if (sk_stream_is_writeable(sk) && test_bit(MPTCP_SEND_SPACE, &msk->flags))
> +	if (sk_stream_is_writeable(sk) &&
> +	    test_bit(MPTCP_SEND_SPACE, &msk->flags))
>  		mask |= EPOLLOUT | EPOLLWRNORM;
>  	if (sk->sk_shutdown & RCV_SHUTDOWN)
>  		mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;

ACK
diff mbox series

Patch

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 71a305f391c4..44e6f0d1070c 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -817,7 +817,8 @@  static __poll_t mptcp_poll(struct file *file, struct socket *sock,
 
 	if (test_bit(MPTCP_DATA_READY, &msk->flags))
 		mask = EPOLLIN | EPOLLRDNORM;
-	if (sk_stream_is_writeable(sk) && test_bit(MPTCP_SEND_SPACE, &msk->flags))
+	if (sk_stream_is_writeable(sk) &&
+	    test_bit(MPTCP_SEND_SPACE, &msk->flags))
 		mask |= EPOLLOUT | EPOLLWRNORM;
 	if (sk->sk_shutdown & RCV_SHUTDOWN)
 		mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;