Commit 294de909 authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

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: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ade4d754

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static inline void mptcp_token_init_request(struct request_sock *req) 


int mptcp_token_new_request(struct request_sock *req);

void mptcp_token_destroy_request(struct request_sock *req);

int mptcp_token_new_connect(struct sock *sk);

int mptcp_token_new_connect(struct sock *ssk);

void mptcp_token_accept(struct mptcp_subflow_request_sock *r,

			struct mptcp_sock *msk);

bool mptcp_token_exists(u32 token);

net/mptcp/token.c

+4 −4
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int mptcp_token_new_request(struct request_sock *req) 


/**

 * mptcp_token_new_connect - create new key/idsn/token for subflow

 * @sk: the socket that will initiate a connection

 * @ssk: the socket that will initiate a connection

 *

 * This function is called when a new outgoing mptcp connection is

 * initiated.
@@ -148,9 +148,9 @@ int mptcp_token_new_request(struct request_sock *req) 
 *

 * returns 0 on success.

 */

int mptcp_token_new_connect(struct sock *sk)

int mptcp_token_new_connect(struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

	struct mptcp_sock *msk = mptcp_sk(subflow->conn);

	int retries = MPTCP_TOKEN_MAX_RETRIES;

	struct token_bucket *bucket;
@@ -169,7 +169,7 @@ int mptcp_token_new_connect(struct sock *sk) 
	}



	pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n",

		 sk, subflow->local_key, subflow->token, subflow->idsn);

		 ssk, subflow->local_key, subflow->token, subflow->idsn);



	WRITE_ONCE(msk->token, subflow->token);

	__sk_nulls_add_node_rcu((struct sock *)msk, &bucket->msk_chain);