[MPTCP] [PATCH v3 05/10] Rename mptcp_attach_dss()

[MPTCP] [PATCH v3 05/10] Rename mptcp_attach_dss()

[Peter Krystad]

[-- Attachment #1: Type: text/plain, Size: 2616 bytes --]

Other incoming MPTCP options will be handled in this routine.

squashto: Implement MPTCP receive path

Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
 include/net/mptcp.h  | 10 +++++-----
 net/ipv4/tcp_input.c |  4 ++--
 net/mptcp/options.c  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 6cd650838ddf..bb2dd193c0c5 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -68,9 +68,8 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
 bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
 			       unsigned int *size, unsigned int remaining,
 			       struct mptcp_out_options *opts);
-
-void mptcp_attach_dss(struct sock *sk, struct sk_buff *skb,
-		      struct tcp_options_received *opt_rx);
+void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,
+			    struct tcp_options_received *opt_rx);
 
 static inline bool mptcp_skb_ext_exist(const struct sk_buff *skb)
 {
@@ -128,8 +127,9 @@ static inline bool mptcp_established_options(struct sock *sk,
 	return false;
 }
 
-static inline void mptcp_attach_dss(struct sock *sk, struct sk_buff *skb,
-				    struct tcp_options_received *opt_rx)
+static inline void mptcp_incoming_options(struct sock *sk,
+					  struct sk_buff *skb,
+					  struct tcp_options_received *opt_rx)
 {
 }
 
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index b92985b4762c..ca2fea882281 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5668,9 +5668,9 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb)
 	/* Process urgent data. */
 	tcp_urg(sk, skb, th);
 
-	/* Prepare MPTCP sequence data */
+	/* Process MPTCP options */
 	if (sk_is_mptcp(sk))
-		mptcp_attach_dss(sk, skb, &tp->rx_opt);
+		mptcp_incoming_options(sk, skb, &tp->rx_opt);
 
 	/* step 7: process the segment text */
 	tcp_data_queue(sk, skb);
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index a1920574161d..1f54c543304e 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -494,8 +494,8 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
 	return false;
 }
 
-void mptcp_attach_dss(struct sock *sk, struct sk_buff *skb,
-		      struct tcp_options_received *opt_rx)
+void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,
+			    struct tcp_options_received *opt_rx)
 {
 	struct subflow_context *subflow = subflow_ctx(sk);
 	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
-- 
2.17.2

Re: [MPTCP] [PATCH v3 05/10] Rename mptcp_attach_dss()

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Hi Peter, Paolo, Mat,

On 08/08/2019 00:44, Peter Krystad wrote:
> Other incoming MPTCP options will be handled in this routine.
> 
> squashto: Implement MPTCP receive path

Thank you for the patch and the reviews!

- 3776155bf643: "squashed" in "mptcp: Implement MPTCP receive path"
- 06256d7cf989..b1477322bbb7: result

Cheers,
Matt
-- 
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium