From nobody Wed Dec 17 00:15:52 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B85FC4167B for ; Thu, 30 Nov 2023 11:28:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345154AbjK3L2X (ORCPT ); Thu, 30 Nov 2023 06:28:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345030AbjK3L2V (ORCPT ); Thu, 30 Nov 2023 06:28:21 -0500 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E81C10D4; Thu, 30 Nov 2023 03:28:27 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=guwen@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VxROoJ0_1701343703; Received: from localhost(mailfrom:guwen@linux.alibaba.com fp:SMTPD_---0VxROoJ0_1701343703) by smtp.aliyun-inc.com; Thu, 30 Nov 2023 19:28:24 +0800 From: Wen Gu To: wintera@linux.ibm.com, wenjia@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, kgraul@linux.ibm.com, jaka@linux.ibm.com Cc: borntraeger@linux.ibm.com, svens@linux.ibm.com, alibuda@linux.alibaba.com, tonylu@linux.alibaba.com, guwen@linux.alibaba.com, raspl@linux.ibm.com, schnelle@linux.ibm.com, linux-s390@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 1/7] net/smc: Rename some variable 'fce' to 'fce_v2x' for clarity Date: Thu, 30 Nov 2023 19:28:09 +0800 Message-Id: <1701343695-122657-2-git-send-email-guwen@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1701343695-122657-1-git-send-email-guwen@linux.alibaba.com> References: <1701343695-122657-1-git-send-email-guwen@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rename some smc_clc_first_contact_ext_v2x type variables to 'fce_v2x' to distinguish them from smc_clc_first_contact_ext type variables. Signed-off-by: Wen Gu --- net/smc/smc_clc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 0fda515..147a771 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -418,15 +418,15 @@ static bool smc_clc_msg_prop_valid(struct smc_clc_msg= _proposal *pclc) return true; } =20 -static int smc_clc_fill_fce(struct smc_clc_first_contact_ext_v2x *fce, - struct smc_init_info *ini) +static int smc_clc_fill_fce_v2x(struct smc_clc_first_contact_ext_v2x *fce_= v2x, + struct smc_init_info *ini) { - int ret =3D sizeof(*fce); + int ret =3D sizeof(*fce_v2x); =20 - memset(fce, 0, sizeof(*fce)); - fce->fce_v2_base.os_type =3D SMC_CLC_OS_LINUX; - fce->fce_v2_base.release =3D 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 =3D SMC_CLC_OS_LINUX; + fce_v2x->fce_v2_base.release =3D 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 =3D sizeof(struct smc_clc_first_contact_ext); goto out; @@ -434,8 +434,8 @@ static int smc_clc_fill_fce(struct smc_clc_first_contac= t_ext_v2x *fce, =20 if (ini->release_nr >=3D SMC_RELEASE_1) { if (!ini->is_smcd) { - fce->max_conns =3D ini->max_conns; - fce->max_links =3D ini->max_links; + fce_v2x->max_conns =3D ini->max_conns; + fce_v2x->max_links =3D ini->max_links; } } =20 @@ -1003,8 +1003,8 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *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 =3D &smc->conn; - struct smc_clc_first_contact_ext_v2x fce; struct smc_clc_msg_accept_confirm *clc; struct smc_clc_fce_gid_ext gle; struct smc_clc_msg_trail trl; @@ -1037,7 +1037,7 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, memcpy(clc_v2->d1.eid, eid, SMC_MAX_EID_LEN); len =3D SMCD_CLC_ACCEPT_CONFIRM_LEN_V2; if (first_contact) { - fce_len =3D smc_clc_fill_fce(&fce, ini); + fce_len =3D smc_clc_fill_fce_v2x(&fce_v2x, ini); len +=3D fce_len; } clc_v2->hdr.length =3D htons(len); @@ -1083,9 +1083,9 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, memcpy(clc_v2->r1.eid, eid, SMC_MAX_EID_LEN); len =3D SMCR_CLC_ACCEPT_CONFIRM_LEN_V2; if (first_contact) { - fce_len =3D smc_clc_fill_fce(&fce, ini); + fce_len =3D smc_clc_fill_fce_v2x(&fce_v2x, ini); len +=3D fce_len; - fce.fce_v2_base.v2_direct =3D !link->lgr->uses_gateway; + fce_v2x.fce_v2_base.v2_direct =3D !link->lgr->uses_gateway; if (clc->hdr.type =3D=3D SMC_CLC_CONFIRM) { memset(&gle, 0, sizeof(gle)); gle.gid_cnt =3D ini->smcrv2.gidlist.len; @@ -1112,7 +1112,7 @@ static int smc_clc_send_confirm_accept(struct smc_soc= k *smc, SMCR_CLC_ACCEPT_CONFIRM_LEN) - sizeof(trl); if (version > SMC_V1 && first_contact) { - vec[i].iov_base =3D &fce; + vec[i].iov_base =3D &fce_v2x; vec[i++].iov_len =3D fce_len; if (!conn->lgr->is_smcd) { if (clc->hdr.type =3D=3D SMC_CLC_CONFIRM) { --=20 1.8.3.1