diff mbox series

squash-to: "mptcp: recvmsg() can drain data from multiple subflows"

Message ID 6d836e5d6b44489f59f9dedfe7743c4b2b6f08d5.1576252967.git.dcaratti@redhat.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series squash-to: "mptcp: recvmsg() can drain data from multiple subflows" | 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:09 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 b9eed120913f..fd89075bd1c9 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -359,7 +359,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
>  			desc.count = min_t(size_t, len - copied, map_remaining);
>  			pr_debug("reading %zu bytes, copied %d", desc.count,
>  				 copied);
> -			bytes_read = tcp_read_sock(ssk, &desc, mptcp_read_actor);
> +			bytes_read = tcp_read_sock(ssk, &desc,
> +						   mptcp_read_actor);
>  			if (bytes_read < 0) {
>  				if (!copied)
>  					copied = bytes_read;

ACK
diff mbox series

Patch

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index b9eed120913f..fd89075bd1c9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -359,7 +359,8 @@  static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
 			desc.count = min_t(size_t, len - copied, map_remaining);
 			pr_debug("reading %zu bytes, copied %d", desc.count,
 				 copied);
-			bytes_read = tcp_read_sock(ssk, &desc, mptcp_read_actor);
+			bytes_read = tcp_read_sock(ssk, &desc,
+						   mptcp_read_actor);
 			if (bytes_read < 0) {
 				if (!copied)
 					copied = bytes_read;