mptcp: fix checkpatch splats
Subsystems (3)
Paolo Abeni
maintainercover mptcp: fix checkpatch splats
This series addresses a bunch of checkpatch reported issues on TFO-related patches
Paolo Abeni (3):
Squash-to: "mptcp: implement delayed seq generation for passive
fastopen"
Squash-to: "mptcp: implement delayed seq generation for passive
fastopen"
Squash-to: "selftests: mptcp: mptfo Initiator/Listener"
net/mptcp/fastopen.c | 10 ++++++---- net/mptcp/protocol.h | 2 -- tools/testing/selftests/net/mptcp/mptcp_connect.c | 13 +++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-)
Signature · 1 line
2.38.1
Paolo Abeni
maintainerPATCH 1/3 Squash-to: "mptcp: implement delayed seq generation for passive fastopen"
We should not use double forward slashes for comments. The affending comments could be removed altogether.
Additionally fix the SPDX license indentifier
--- net/mptcp/fastopen.c | 6 ++++-- net/mptcp/protocol.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-)
net/mptcp/fastopen.c +4 -2
@@ -1,5 +1,7 @@ -/* SPDX-License-Identifier: GPL-2.0 -* MPTCP Fast Open Mechanism. Copyright (c) 2021-2022, Dmytro SHYTYI +// SPDX-License-Identifier: GPL-2.0 +/* MPTCP Fast Open Mechanism +* +* Copyright (c) 2021-2022, Dmytro SHYTYI */ #include "protocol.h"
net/mptcp/protocol.h +0 -2
@@ -848,13 +848,11 @@ void mptcp_event_addr_announced(const struct sock *ssk, const struct mptcp_addr_void mptcp_event_addr_removed (const struct mptcp_sock *msk,u8 id);bool mptcp_userspace_pm_active (const struct mptcp_sock *msk); -// Fast Open Mechanism functions begin void mptcp_gen_msk_ackseq_fastopen (struct mptcp_sock *msk,struct mptcp_subflow_context *subflow,const struct mptcp_options_received *mp_opt);void mptcp_set_owner_r (struct sk_buff *skb,struct sock *sk);void subflow_fastopen_send_synack_set_params (struct mptcp_subflow_context *subflow,struct request_sock *req); -// Fast Open Mechanism functions end static inline bool mptcp_pm_should_add_signal (struct mptcp_sock *msk) {
Signature · 1 line
2.38.1
Paolo Abeni
maintainerPATCH 3/3 Squash-to: "selftests: mptcp: mptfo Initiator/Listener"
In reply to Paolo Abeniwrap a bunch of long lines, and insert needed empty line after variable declaration.
--- tools/testing/selftests/net/mptcp/mptcp_connect.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +9 -4
@@ -377,7 +377,8 @@ static int sock_connect_mptcp(const char * const remoteaddr,if (cfg_sockopt_types.mptfo) {if (!winfo->total_len) - winfo->total_len = winfo->len =read (infd, winfo->buf,sizeof (winfo->buf)); + winfo->total_len = winfo->len =read (infd, winfo->buf, +sizeof (winfo->buf)); syn_copied =sendto (sock, winfo->buf, winfo->len,MSG_FASTOPEN , a->ai_addr, a->ai_addrlen);
@@ -837,6 +838,7 @@ static int do_sendfile(int infd, int outfd, unsigned int count, struct wstate *winfo) {int ret =spool_buf (outfd, winfo); +if (ret <0 )return ret;
@@ -920,21 +922,24 @@ static int copyfd_io(int infd, int peerfd, int outfd, bool close_peerfd, structswitch (cfg_mode) {case CFG_MODE_POLL : - ret =copyfd_io_poll (infd, peerfd, outfd, &in_closed_after_out, winfo); + ret =copyfd_io_poll (infd, peerfd, outfd, &in_closed_after_out, + winfo);break ;case CFG_MODE_MMAP : file_size =get_infd_size (infd);if (file_size <0 )return file_size; - ret =copyfd_io_mmap (infd, peerfd, outfd, file_size, &in_closed_after_out, winfo); + ret =copyfd_io_mmap (infd, peerfd, outfd, file_size, + &in_closed_after_out, winfo);break ;case CFG_MODE_SENDFILE : file_size =get_infd_size (infd);if (file_size <0 )return file_size; - ret =copyfd_io_sendfile (infd, peerfd, outfd, file_size, &in_closed_after_out, winfo); + ret =copyfd_io_sendfile (infd, peerfd, outfd, file_size, + &in_closed_after_out, winfo);break ;default :
Signature · 1 line
2.38.1
Paolo Abeni
maintainerPATCH 2/3 Squash-to: "mptcp: implement delayed seq generation for passive fastopen"
In reply to Paolo Abenifix checkpatch warning
--- net/mptcp/fastopen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mptcp/fastopen.c +2 -2
@@ -70,8 +70,8 @@ void mptcp_gen_msk_ackseq_fastopen(struct mptcp_sock *msk, struct mptcp_subflow_if (skb) {WARN_ON_ONCE (MPTCP_SKB_CB (skb)->end_seq);pr_debug ("msk %p moving seq %llx -> %llx end_seq %llx -> %llx" , sk, -MPTCP_SKB_CB (skb)->map_seq, msk->ack_seq +MPTCP_SKB_CB (skb)->map_seq, -MPTCP_SKB_CB (skb)->end_seq,MPTCP_SKB_CB (skb)->end_seq + msk->ack_seq); +MPTCP_SKB_CB (skb)->map_seq,MPTCP_SKB_CB (skb)->map_seq + msk->ack_seq, +MPTCP_SKB_CB (skb)->end_seq,MPTCP_SKB_CB (skb)->end_seq + msk->ack_seq);MPTCP_SKB_CB (skb)->map_seq += msk->ack_seq;MPTCP_SKB_CB (skb)->end_seq += msk->ack_seq; }
Signature · 1 line
2.38.1
Hi Paolo,
Quoted 9 lines · Paolo Abeni
This series addresses a bunch of checkpatch reported issues on TFO-related patches
Paolo Abeni (3):
Squash-to: "mptcp: implement delayed seq generation for passive
fastopen"
Squash-to: "mptcp: implement delayed seq generation for passive
fastopen"
Squash-to: "selftests: mptcp: mptfo Initiator/Listener"
Thank you for the patches, I didn't fix them when I applied the original patches as I usually because there were quite a few (and I had to go) but added that to my TODO list. I can remove that from my TODO list then, thanks! :)
- a8f5e57ea3bb: "squashed" (with conflicts) patch 1/3 in "mptcp:
implement delayed seq generation for passive fastopen"
- 5dffe8c2719d: "squashed" patch 2/3 in "mptcp: implement delayed seq generation for passive fastopen"
- 849dac7246e2: conflict in t/mptcp-add-subflow_v-4-6-_send_synack
- 1e76c3150046: "squashed" patch 3/3 in "selftests: mptcp: mptfo Initiator/Listener"
- Results: 14ca49819653..ff1606d98e1c (export)
Tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20221114T154623
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net