* [PATCH mptcp-next 1/3] Squash-to: "mptcp: implement delayed seq generation for passive fastopen"
2022-11-14 11:54 [PATCH mptcp-next 0/3] mptcp: fix checkpatch splats Paolo Abeni
@ 2022-11-14 11:54 ` Paolo Abeni
2022-11-14 11:54 ` [PATCH mptcp-next 2/3] " Paolo Abeni
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Abeni @ 2022-11-14 11:54 UTC (permalink / raw)
To: mptcp; +Cc: Dmytro Shytyi
We should not use double forward slashes for comments. The affending
comments could be removed altogether.
Additionally fix the SPDX license indentifier
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/fastopen.c | 6 ++++--
net/mptcp/protocol.h | 2 --
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c
index d1ae7d2405dc..b41248b50123 100644
--- a/net/mptcp/fastopen.c
+++ b/net/mptcp/fastopen.c
@@ -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"
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index c81bb7d6aab7..0f1e26e55c01 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -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)
{
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH mptcp-next 2/3] Squash-to: "mptcp: implement delayed seq generation for passive fastopen"
2022-11-14 11:54 [PATCH mptcp-next 0/3] mptcp: fix checkpatch splats Paolo Abeni
2022-11-14 11:54 ` [PATCH mptcp-next 1/3] Squash-to: "mptcp: implement delayed seq generation for passive fastopen" Paolo Abeni
@ 2022-11-14 11:54 ` Paolo Abeni
2022-11-14 11:54 ` [PATCH mptcp-next 3/3] Squash-to: "selftests: mptcp: mptfo Initiator/Listener" Paolo Abeni
2022-11-14 15:49 ` [PATCH mptcp-next 0/3] mptcp: fix checkpatch splats Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Abeni @ 2022-11-14 11:54 UTC (permalink / raw)
To: mptcp; +Cc: Dmytro Shytyi
fix checkpatch warning
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/fastopen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c
index b41248b50123..e1fe919c00c2 100644
--- a/net/mptcp/fastopen.c
+++ b/net/mptcp/fastopen.c
@@ -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;
}
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH mptcp-next 3/3] Squash-to: "selftests: mptcp: mptfo Initiator/Listener"
2022-11-14 11:54 [PATCH mptcp-next 0/3] mptcp: fix checkpatch splats Paolo Abeni
2022-11-14 11:54 ` [PATCH mptcp-next 1/3] Squash-to: "mptcp: implement delayed seq generation for passive fastopen" Paolo Abeni
2022-11-14 11:54 ` [PATCH mptcp-next 2/3] " Paolo Abeni
@ 2022-11-14 11:54 ` Paolo Abeni
2022-11-14 15:49 ` [PATCH mptcp-next 0/3] mptcp: fix checkpatch splats Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Abeni @ 2022-11-14 11:54 UTC (permalink / raw)
To: mptcp; +Cc: Dmytro Shytyi
wrap a bunch of long lines, and insert needed empty line
after variable declaration.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
tools/testing/selftests/net/mptcp/mptcp_connect.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index ee8d320b071c..c8bd109c991f 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -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, struct
switch (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:
--
2.38.1
^ permalink raw reply related [flat|nested] 5+ messages in thread