mptcp: fastopen: uniform function names (part 2)
Functions are usually prefixed with mptcp_<filename>_(...), e.g.
mptcp_fastopen_(...). Do the same here with the new fastopen functions.
While at it, also remove the 'send' from the function name as we don't
send anything, we only prepare it for the send. Best to avoid
confusions.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
net/mptcp/fastopen.c | 4 ++--
net/mptcp/protocol.h | 4 ++--
net/mptcp/subflow.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c
index d3f1ce7b45ac..4a85e1110328 100644
--- a/net/mptcp/fastopen.c
+++ b/net/mptcp/fastopen.c
@@ -6,8 +6,8 @@
#include "protocol.h"
-void subflow_fastopen_send_synack_set_params(struct mptcp_subflow_context *subflow,
- struct request_sock *req)
+void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subflow,
+ struct request_sock *req)
{
struct sock *ssk = subflow->tcp_sock;
struct sock *sk = subflow->conn;
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 96a3386c908a..ad204ef88bc3 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -851,8 +851,8 @@ bool mptcp_userspace_pm_active(const struct mptcp_sock *msk);
void mptcp_fastopen_gen_msk_ackseq(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);
+void mptcp_fastopen_subflow_synack_set_params(struct mptcp_subflow_context *subflow,
+ struct request_sock *req);
static inline bool mptcp_pm_should_add_signal(struct mptcp_sock *msk)
{
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index b613046fea11..255023b78924 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -322,7 +322,7 @@ static int subflow_v4_send_synack(const struct sock *sk, struct dst_entry *dst,
ireq->tstamp_ok = 0;
if (synack_type == TCP_SYNACK_FASTOPEN)
- subflow_fastopen_send_synack_set_params(subflow, req);
+ mptcp_fastopen_subflow_synack_set_params(subflow, req);
return tcp_request_sock_ipv4_ops.send_synack(sk, dst, fl, req, foc, synack_type, syn_skb);
}
@@ -343,7 +343,7 @@ static int subflow_v6_send_synack(const struct sock *sk, struct dst_entry *dst,
ireq->tstamp_ok = 0;
if (synack_type == TCP_SYNACK_FASTOPEN)
- subflow_fastopen_send_synack_set_params(subflow, req);
+ mptcp_fastopen_subflow_synack_set_params(subflow, req);
return tcp_request_sock_ipv6_ops.send_synack(sk, dst, fl, req, foc, synack_type, syn_skb);
}
--
2.37.2