From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64DD7A0547; Mon, 27 Sep 2021 11:18:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B0B740686; Mon, 27 Sep 2021 11:18:09 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 798B04003D for ; Mon, 27 Sep 2021 11:18:07 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10119"; a="222550277" X-IronPort-AV: E=Sophos;i="5.85,326,1624345200"; d="scan'208";a="222550277" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2021 02:17:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,326,1624345200"; d="scan'208";a="561148040" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2021 02:17:57 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 27 Sep 2021 02:17:57 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 27 Sep 2021 02:17:57 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 27 Sep 2021 02:17:57 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.172) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 27 Sep 2021 02:17:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fxwz52s8AT6YeWr8DMGpFzIrOLfujlEQKZLdJY6izcnIC2CgHE670Ab8ODstsphE23NiZ4AdfXvLmXxLyWzyMcAKY1J65IKqbDpruXsbLtijo0+YxP7DLUajkXcM9sXwnRXhywmFS+QP1z9FBIPydV2feq0dfQnPi1JgF86gvhoEvMdS5U4wkdSFg0DFEE5zhiMRU2LkwcnKDgjpMIPWdYdja/mQ/t4N80JQ3sQ/TnOLm0xtPyQD+VqYzxYr1O5QXjipMUm++n90RCUdDAVVL/gOIUaTZvDxQoGOA0/rWHuNVx7PZlfAhNnGNCH4DCT6JnBx9iq9ng9TGMhvmw5eyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MYY6Md/Yw9QO16rg01Zfg35ugBFaHzkNdSQKBFt4/fU=; b=MtZ8BlrgDuvjGvvtALSvj8+MJALSnswl0B5S7wvCoSaDQUe8U6xX2UD5d3S+icsnCvb1uUskrU3xkLk0FK+aCaPwNGj+A1dC4MItWXtjqUVtz+Xd42qzN9fOkGuF5xvHGSnBzV3ZmHxNAY5CCa+h4wcx7iVgv+P8CoVeDmVWU7q5b1M/5jmfsVL8+ZZrdp3BOB+2g5xEL0UKfaf9/oruYNSu21dzxVHQOSCioq8yNbjRpfwrSumz9vpQZ35nPoS97u0FJdAMJZrcu1yejR9AW8EZxQ/4Ur1IHQ5YEib0w5JmMY+rC9m4XExNxIilto3YzKoVwMtSiNrkX7n8dsuhRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MYY6Md/Yw9QO16rg01Zfg35ugBFaHzkNdSQKBFt4/fU=; b=zbdIxQ9EFnNHGi0xt9O6XBotEmbMoq8OMWhqkYBtvZ6ZcCv6a4DRVnVcVh4xAGh6Uff03s8dvoBJKRtSND3E5Qq/IL+27DN4+nY3esUJN6mKwj9ddQUOu0O/EaOlxSF2kqdIftgXlYAGUU/EsRmQ05zZxJWlp8+OA5jtPI/yapQ= Received: from MWHPR11MB1872.namprd11.prod.outlook.com (2603:10b6:300:110::7) by CO1PR11MB4836.namprd11.prod.outlook.com (2603:10b6:303:9d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Mon, 27 Sep 2021 09:17:53 +0000 Received: from MWHPR11MB1872.namprd11.prod.outlook.com ([fe80::91db:5c1b:df05:231]) by MWHPR11MB1872.namprd11.prod.outlook.com ([fe80::91db:5c1b:df05:231%12]) with mapi id 15.20.4544.021; Mon, 27 Sep 2021 09:17:53 +0000 From: "Xing, Beilei" To: "Zhang, RobinX" , "dev@dpdk.org" CC: "Zhang, Qi Z" , "Zhang, Helin" , "Wu, Jingjing" , "remy.horton@intel.com" , "jijiang.liu@intel.com" , "jing.d.chen@intel.com" , "Zhu, Heqing" , "Liang, Cunming" , "Lu, Wenzhuo" , "Zhang, Roy Fan" , "Chilikin, Andrey" , "echaudro@redhat.com" , "Guo, Junfeng" , "Yang, SteveX" Thread-Topic: [PATCH v4 18/18] net/i40e: fix redefinition warning Thread-Index: AQHXosVcd5wLfauzY0axbc8dP0lCjqu3u18g Date: Mon, 27 Sep 2021 09:17:53 +0000 Message-ID: References: <20210618063851.3694702-1-robinx.zhang@intel.com> <20210906020258.1291688-1-robinx.zhang@intel.com> <20210906020258.1291688-19-robinx.zhang@intel.com> In-Reply-To: <20210906020258.1291688-19-robinx.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 28d516ff-1dbb-41b4-e948-08d98197af87 x-ms-traffictypediagnostic: CO1PR11MB4836: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:556; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: A06JrUh2+CUH88oIFoDe4zjhMeJQQu0cU/CB+zH6dxZlfAYqZnXmQDgpJeVd0+xHR0lHNhDW0EoEw0EAHBc+IP/M3JLGA2KsaoZC8tY6gInBRtDG1WRpIJLAS9ky++vxxb4CePlcmiKSt87pqAbKxeW77aSNSdYgMG1nyLnCL/IOH8ZP/RC8nXuui4OijSknBVq+YpInlBxCC3uhw4WKELkxBIkRSGNDp4cwtxrt5iXDQ3IkPSTfth1wLPXHC0RlafTeHsjYcEMWQT75xNDDOQOr69MMy1g8FuhdYoJ/1puuUpsa8E+x9JApZ3/YSY0Vt94bNBQsvzWJ95dMN1kjmR4YXpyIOJB/nDjDdVzPBlOVPZwDWX8CJCvsnu1VxNNNlJHxr051ijjmAX+3IC2ijSVydBg+SGPJJJoRw20A7ZPyL5mO1EF+rnsRVE97pd24tuObaZoFvqIDnVVnMtY5A1NQ9FwLQguHwlW2v5p/LG+9NPV16egzzIAsJScoIAffsepATP8pLcpPVVKMzHqqF9ZwxMxyJApmDsiUYPT0xJwEKfsib4dBQUNj10jkkGNdoGrLwvCcydpLLEBMBgheSfo2P+jVpJLvss0B21lzLwL02aCB/o88SeV2y+dAnIsgNJfM8na/FKW2QtounfppPFerNqEay/PXwTdKnkmFTZuieRQHNzFA0l0ZgGj1u2PPRV26y6LXq0S1u0ogFy9pIw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1872.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(110136005)(5660300002)(316002)(122000001)(83380400001)(8676002)(55016002)(38070700005)(107886003)(8936002)(186003)(38100700002)(6506007)(508600001)(7696005)(71200400001)(26005)(53546011)(4326008)(54906003)(76116006)(9686003)(2906002)(66476007)(33656002)(86362001)(64756008)(66556008)(66946007)(52536014)(66446008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?jHOoIKlg0YbO+Kmr2ByVXagkIAcCaFv6FHYa0n0yptfP0PbXAPl6BgZmSqwd?= =?us-ascii?Q?1QWyJnczTkidqxRQFFzV5oV43kmA79DKgH4j8fLzpozP9J68N6NqK4dZIEvI?= =?us-ascii?Q?JOVMW1Xb3r2XjcuOkcZaML3jroaQleV+0huEE4VZH0evmm91TYGHG7DaQidS?= =?us-ascii?Q?ILg8YWM6NLuvDzXM9ws2qU/+exCxwXoV/M1tNm4+VXgkrE8exP5lYwbQJnoU?= =?us-ascii?Q?ZPfqUtmFxe6hD016lSvDJ8xo8EnmuqSbvB9acxGlu90EbjpN7a4xZWE4xQde?= =?us-ascii?Q?KPEUFCCGD3cU4pBwVji/qslkBQ3Ns1WZgx48UzTTKn5c26pYG53Gmgi2HCLT?= =?us-ascii?Q?vXZOMFvV3WdxL4+5Ri/db8UdBkEpMg9BQuBEIZ4GkEayBFPo5z8lXMsRPq90?= =?us-ascii?Q?/QYHvmVpT2sfAFlC/u/ArmZGpnZmtAw+e9LfrIDqui/EY11sXODn+13+Ar6v?= =?us-ascii?Q?4c5+ZBfDgq96dtqAMn4LTz0DAKql8jeXbSiXjTN8DZHoJ2tB/cUZ6z1fQvB7?= =?us-ascii?Q?ZmcAI+O2kbTX3ePnsp/ygtiH0cayhRVLN0Odjpd2yStBAQSXnS4F1yRhvRWy?= =?us-ascii?Q?8rEUN5STCyN20Qrfw7sFwMYmqn1w+E+R3xsCsrjj5ujpPdJ9FDJStmtDkvpf?= =?us-ascii?Q?+F8efvfoYHI+htmiIX9cdwgf6WGyNiQEMoLCpOvcdbMhJkj+18mUftn8LLjg?= =?us-ascii?Q?7IQH6YfUe34V0pnepM9jNyzTaEdRzwIpjkTJh/p+Z9uXiysZo4rDsIAR8Mi+?= =?us-ascii?Q?MgZN7xfGYrxf8LitlYgN7Zdt07MG5QlNaWZLLmuC5DKQPqfdESaL5Xy2hN2B?= =?us-ascii?Q?lvIRHvk6iotFhVQPy3R9AholAg8inxt3mdGRSfNSaTQ2GdSQMwtXb37vD9Y3?= =?us-ascii?Q?HzqdDhDFVCAbXzXVVvwlTOEAO+dKwOghWYS+V1pn9Pun2yIClaEHwpzqcDJx?= =?us-ascii?Q?QqgstY/XNuUeNAvSXjVGvSONAzU7INayVUh/3++xiUKz0s4++vLtnnjONyHW?= =?us-ascii?Q?YdRfycYR8zjMB9jrlTrNvgxG2Z5jVGsxx8FursK42wbwkHnvAbK0H6/+OZcM?= =?us-ascii?Q?DMCdYtUYmBxbBK4OP40YfOtZLM78iXBhiF3U6vtTLmxdWU6G+MojxsKL6idf?= =?us-ascii?Q?d3nR4BBtVFY8dUTa+a1PBwteU3Tii1yNApvUwE1E/fK8S7NJ4E5sPdoUrJyo?= =?us-ascii?Q?vrsCIhmiNJh0G5HOM3bWSPNttYP5g4ISKNb4pHcENcL2DWrldAdANqxddOGN?= =?us-ascii?Q?/s2RSK0NvIH4lPQBEmMpOtmp0oTtpPxoq8Fg+R43U4iMrJkGCiMI5tuRsNQg?= =?us-ascii?Q?q1VLWj6A+lPP1U48fGQOme2f?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28d516ff-1dbb-41b4-e948-08d98197af87 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Sep 2021 09:17:53.2701 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lQ4JoHOrFmJp0qSJX4xVYDc21KUc27o9S2IrOOFtzzMCqXCaRHytn5R6aQcGpDfLH/uukK8yCt6xXGMjEm64kQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4836 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v4 18/18] net/i40e: fix redefinition warning X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" > -----Original Message----- > From: Zhang, RobinX > Sent: Monday, September 6, 2021 10:03 AM > To: dev@dpdk.org > Cc: Xing, Beilei ; Zhang, Qi Z ; > Zhang, Helin ; Wu, Jingjing ; > remy.horton@intel.com; jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu, > Heqing ; Liang, Cunming > ; Lu, Wenzhuo ; Zhang, > Roy Fan ; Chilikin, Andrey > ; echaudro@redhat.com; Guo, Junfeng > ; Yang, SteveX ; Zhang, > RobinX > Subject: [PATCH v4 18/18] net/i40e: fix redefinition warning >=20 > After update i40e share code, there will be a redefinition compile warnin= g. > This patch fix the situation by remove duplicate definition in i40e_ethde= v.c >=20 > Fixes: eef2daf2e199 ("net/i40e: fix link update no wait") Need to cc stable? >=20 > Signed-off-by: Robin Zhang > --- > drivers/net/i40e/i40e_ethdev.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 7b230e2ed1..4fc44dc5e2 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -2886,7 +2886,6 @@ static __rte_always_inline void > update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) { > /* Link status registers and values*/ > -#define I40E_PRTMAC_LINKSTA 0x001E2420 > #define I40E_REG_LINK_UP 0x40000080 > #define I40E_PRTMAC_MACC 0x001E24E0 > #define I40E_REG_MACC_25GB 0x00020000 > @@ -2899,7 +2898,7 @@ update_link_reg(struct i40e_hw *hw, struct > rte_eth_link *link) > uint32_t link_speed; > uint32_t reg_val; >=20 > - reg_val =3D I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA); > + reg_val =3D I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA(0)); > link_speed =3D reg_val & I40E_REG_SPEED_MASK; > reg_val &=3D I40E_REG_LINK_UP; > link->link_status =3D (reg_val =3D=3D I40E_REG_LINK_UP) ? 1 : 0; > -- > 2.25.1