[MPTCP] [PATCH 2/4] mptcp: use customary name for tcp_sock variable

[MPTCP] [PATCH 2/4] mptcp: use customary name for tcp_sock variable

[Paolo Abeni]

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

The variable is currently renamed in later patch
"mptcp: Handle MP_CAPABLE options for outgoing connections",
let's do it here instead

Squash-to: mptcp: Associate MPTCP context with TCP socket
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
 net/mptcp/subflow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index c1800f94437d..29d4d1cb284e 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -63,8 +63,8 @@ static struct mptcp_subflow_context *subflow_create_ctx(struct sock *sk,
 
 static int subflow_ulp_init(struct sock *sk)
 {
-	struct tcp_sock *tsk = tcp_sk(sk);
 	struct mptcp_subflow_context *ctx;
+	struct tcp_sock *tp = tcp_sk(sk);
 	int err = 0;
 
 	/* disallow attaching ULP to a socket unless it has been
@@ -83,7 +83,7 @@ static int subflow_ulp_init(struct sock *sk)
 
 	pr_debug("subflow=%p", ctx);
 
-	tsk->is_mptcp = 1;
+	tp->is_mptcp = 1;
 out:
 	return err;
 }
-- 
2.21.0