Commit 241a96d4 authored by Wen Gu's avatar Wen Gu Committed by Zhengchao Shao
Browse files

net/smc: rename some 'fce' to 'fce_v2x' for clarity 

mainline inclusion
from mainline-v6.8-rc1
commit ac053a169c71ceb0f25f784fce9ea720455097b4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IACM52

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ac053a169c71ceb0f25f784fce9ea720455097b4



--------------------------------

Rename some functions or variables with 'fce' in their name but used in
SMCv2.1 as 'fce_v2x' for clarity.

Signed-off-by: default avatarWen Gu <guwen@linux.alibaba.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent 10bfbd53

net/smc/smc_clc.c

+16 −14
Original line number Diff line number Diff line
@@ -428,15 +428,16 @@ smc_clc_msg_decl_valid(struct smc_clc_msg_decline *dclc) 
	return true;

}



static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce,

static int smc_clc_fill_fce_v2x(struct smc_clc_first_contact_ext_v2x *fce_v2x,

				struct smc_init_info *ini)

{

	int ret = sizeof(*fce);

	int ret = sizeof(*fce_v2x);



	memset(fce, 0, sizeof(*fce));

	fce->fce_v2_base.os_type = SMC_CLC_OS_LINUX;

	fce->fce_v2_base.release = ini->release_nr;

	memcpy(fce->fce_v2_base.hostname, smc_hostname, sizeof(smc_hostname));

	memset(fce_v2x, 0, sizeof(*fce_v2x));

	fce_v2x->fce_v2_base.os_type = SMC_CLC_OS_LINUX;

	fce_v2x->fce_v2_base.release = ini->release_nr;

	memcpy(fce_v2x->fce_v2_base.hostname,

	       smc_hostname, sizeof(smc_hostname));

	if (ini->is_smcd && ini->release_nr < SMC_RELEASE_1) {

		ret = sizeof(struct smc_clc_first_contact_ext);

		goto out;
@@ -444,8 +445,8 @@ static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce, 


	if (ini->release_nr >= SMC_RELEASE_1) {

		if (!ini->is_smcd) {

			fce->max_conns = ini->max_conns;

			fce->max_links = ini->max_links;

			fce_v2x->max_conns = ini->max_conns;

			fce_v2x->max_links = ini->max_links;

		}

	}
@@ -1012,8 +1013,8 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, 
				       int first_contact, u8 version,

				       u8 *eid, struct smc_init_info *ini)

{

	struct smc_clc_first_contact_ext_v2x fce_v2x;

	struct smc_connection *conn = &smc->conn;

	struct smc_clc_first_contact_ext_v2x fce;

	struct smcd_dev *smcd = conn->lgr->smcd;

	struct smc_clc_msg_accept_confirm *clc;

	struct smc_clc_fce_gid_ext gle;
@@ -1045,7 +1046,7 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, 
				memcpy(clc_v2->d1.eid, eid, SMC_MAX_EID_LEN);

			len = SMCD_CLC_ACCEPT_CONFIRM_LEN_V2;

			if (first_contact) {

				fce_len = smc_clc_fill_fce(&fce, ini);

				fce_len = smc_clc_fill_fce_v2x(&fce_v2x, ini);

				len += fce_len;

			}

			clc_v2->hdr.length = htons(len);
@@ -1091,9 +1092,10 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, 
				memcpy(clc_v2->r1.eid, eid, SMC_MAX_EID_LEN);

			len = SMCR_CLC_ACCEPT_CONFIRM_LEN_V2;

			if (first_contact) {

				fce_len = smc_clc_fill_fce(&fce, ini);

				fce_len = smc_clc_fill_fce_v2x(&fce_v2x, ini);

				len += fce_len;

				fce.fce_v2_base.v2_direct = !link->lgr->uses_gateway;

				fce_v2x.fce_v2_base.v2_direct =

					!link->lgr->uses_gateway;

				if (clc->hdr.type == SMC_CLC_CONFIRM) {

					memset(&gle, 0, sizeof(gle));

					gle.gid_cnt = ini->smcrv2.gidlist.len;
@@ -1120,7 +1122,7 @@ static int smc_clc_send_confirm_accept(struct smc_sock *smc, 
						SMCR_CLC_ACCEPT_CONFIRM_LEN) -

				   sizeof(trl);

	if (version > SMC_V1 && first_contact) {

		vec[i].iov_base = &fce;

		vec[i].iov_base = &fce_v2x;

		vec[i++].iov_len = fce_len;

		if (!conn->lgr->is_smcd) {

			if (clc->hdr.type == SMC_CLC_CONFIRM) {