Skip to content

Commit 294de90

Browse files
menglongdongdavem330
authored andcommitted
mptcp: rename 'sk' to 'ssk' in mptcp_token_new_connect()
'ssk' should be more appropriate to be the name of the first argument in mptcp_token_new_connect(). Acked-by: Paolo Abeni <[email protected]> Signed-off-by: Menglong Dong <[email protected]> Signed-off-by: Mat Martineau <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ade4d75 commit 294de90

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

net/mptcp/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static inline void mptcp_token_init_request(struct request_sock *req)
754754

755755
int mptcp_token_new_request(struct request_sock *req);
756756
void mptcp_token_destroy_request(struct request_sock *req);
757-
int mptcp_token_new_connect(struct sock *sk);
757+
int mptcp_token_new_connect(struct sock *ssk);
758758
void mptcp_token_accept(struct mptcp_subflow_request_sock *r,
759759
struct mptcp_sock *msk);
760760
bool mptcp_token_exists(u32 token);

net/mptcp/token.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int mptcp_token_new_request(struct request_sock *req)
134134

135135
/**
136136
* mptcp_token_new_connect - create new key/idsn/token for subflow
137-
* @sk: the socket that will initiate a connection
137+
* @ssk: the socket that will initiate a connection
138138
*
139139
* This function is called when a new outgoing mptcp connection is
140140
* initiated.
@@ -148,9 +148,9 @@ int mptcp_token_new_request(struct request_sock *req)
148148
*
149149
* returns 0 on success.
150150
*/
151-
int mptcp_token_new_connect(struct sock *sk)
151+
int mptcp_token_new_connect(struct sock *ssk)
152152
{
153-
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
153+
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
154154
struct mptcp_sock *msk = mptcp_sk(subflow->conn);
155155
int retries = MPTCP_TOKEN_MAX_RETRIES;
156156
struct token_bucket *bucket;
@@ -169,7 +169,7 @@ int mptcp_token_new_connect(struct sock *sk)
169169
}
170170

171171
pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n",
172-
sk, subflow->local_key, subflow->token, subflow->idsn);
172+
ssk, subflow->local_key, subflow->token, subflow->idsn);
173173

174174
WRITE_ONCE(msk->token, subflow->token);
175175
__sk_nulls_add_node_rcu((struct sock *)msk, &bucket->msk_chain);

0 commit comments

Comments
 (0)