Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132562/?format=api
{ "id": 132562, "url": "http://patchwork.dpdk.org/api/patches/132562/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231012012704.483828-5-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231012012704.483828-5-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231012012704.483828-5-chaoyong.he@corigine.com", "date": "2023-10-12T01:26:57", "name": "[v2,04/11] net/nfp: standard the local variable coding style", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a0361329aae3619a034cad6938daba5dd7f2c45b", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231012012704.483828-5-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29821, "url": "http://patchwork.dpdk.org/api/series/29821/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29821", "date": "2023-10-12T01:26:53", "name": "Unify the PMD coding style", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29821/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132562/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132562/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E50AB4236A;\n\tThu, 12 Oct 2023 03:28:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D2BC1406B7;\n\tThu, 12 Oct 2023 03:27:56 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2117.outbound.protection.outlook.com [40.107.220.117])\n by mails.dpdk.org (Postfix) with ESMTP id 8882B4068E\n for <dev@dpdk.org>; Thu, 12 Oct 2023 03:27:54 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH0PR13MB5975.namprd13.prod.outlook.com (2603:10b6:510:16e::5)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Thu, 12 Oct\n 2023 01:27:52 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::2d5:f7d6:ecde:c93a]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::2d5:f7d6:ecde:c93a%4]) with mapi id 15.20.6863.032; Thu, 12 Oct 2023\n 01:27:52 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=W+t8GSdHq4BDLFuY6aHkkE6Sf6Etn5XtzAJOvd2ARDPmhNZb+3YyqgBvzrB10xMIF8Nhq3RxzTWb8rv7ujbHx2HBaA9ze8Q6yBXu8GwLQK2q+p5DJAPbMf348WHusMUmvPiEOC9waZFDHZP4kP9uX+b5hnzahKXZ2FPqg7pimL3FAc89iD6ODNBCcx9WDGHy/1u8vSbEDEhmPYpPJt1hUT1OZHaS6A3dLvbS9xf7oOJKYcJZU9IKnEOyUXLAz6M8lw1KBo322l2mYh5a2+r8LgNspXwC1+4m1W7oGIw/PITV/g4EecxLP0BXiqni/7g7MpNPMLs2AnrJeSXp93F38Q==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=R5Ns+QvXT21Irh1DoWIzXPe151Kx/BIspbWI/40noyE=;\n b=ldfFuddPFL6GeRS2+E3itTpYGbsj9T2l+F2cJ9MJ9oP0TsS3Olcriep3kL28hL2o0bzv7u7+awVv/xOK73U8L4MpQFFO4YMEMLtjgBrPg86fvia5v29xgVMdG/qpKI6gQ0tk8jfVUEPwcKx4lkWV5qpe2rcHaoDYi9x/K0WjUa+yCdoDO9dsXOQRW02T43eyDHgtu9M63TrYWiIc2AifgwcoGPXb+gSw3AWziL3WqPXVFvwqWnEkqIOZ2DOw5tYhAZDoP0Nguewe8reUJV2BkeaUoVL/0iezYAt0KzwGZ8G8oCA1bbB45kA4Uja/gEVJnrUWhMkOKRvFFr2jCDCKyQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=R5Ns+QvXT21Irh1DoWIzXPe151Kx/BIspbWI/40noyE=;\n b=QyDEitskTl7etSq7exqOcl6/Iwk5R4mtZf4CThK1ufxK8kDfI6T+J54wVTFJwdt+NhXEu7+3tSCD/e2UbUMRa9NBk2gX2dyAZmqi58SALxlHxZzj//JxF4mU0r5fBUk3/Wp78XQdDet3mLc6RrnarAYIfyAg9fxQBeY0gePqg20=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Long Wu <long.wu@corigine.com>, Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH v2 04/11] net/nfp: standard the local variable coding style", "Date": "Thu, 12 Oct 2023 09:26:57 +0800", "Message-Id": "<20231012012704.483828-5-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231012012704.483828-1-chaoyong.he@corigine.com>", "References": "<20231007023339.1546659-1-chaoyong.he@corigine.com>\n <20231012012704.483828-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "PH8PR15CA0015.namprd15.prod.outlook.com\n (2603:10b6:510:2d2::23) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|PH0PR13MB5975:EE_", "X-MS-Office365-Filtering-Correlation-Id": "d2bc31d7-665e-41e0-5250-08dbcac273ac", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n JezFCCDD8gsfAUD77Bgd7XcH2T3mcPgM79DG0lWoPNXstSAkDp7fDvvjDwyVge+RsgaQfUOYNGfpNkWhRENdvsAjjJeoWI4gu9cAFxI5aixiWjY4NCkxTA11rJRHI746rWSO1OuLTKFfUNfuDQuS70fO1qMf8aI9Ev1hYxRQL0SkKrhfwuv4u95Q3zix5uEKeWJjksZKB5J8OxXQsaLmMAg078masN1B8+SB15onPaGxHvAYkYd75aCBytp4L8jcy5OFHLbQxXdiRjBpVTF5ABL38CajTHQeMN0rGw0Mpbp8JDOV6POHqLCLs3MisHjflC6OV+ma98wpnEC45GRnJ9PQQZabgFF4oFDK24OepdeM/HPOL2i/XZ+cPnsxQWfcPhalQTAu+GmcpUunmU5Y3XVmePoI9EZGfM8jAVEToAHH9K90jwRsix2UFOFH1e5DXd3mB2fVdP4KT3U9O+rJQj6CFGKTpSvZR+I2vfWtw2Ol0MAl3XGkY7yhOGK+G6a2uTKMQ85tHSFywujx5iZ5yJRg+B6oAABTaUIyuXGKZg0nw+Qu8OMLr2oJC/FWd1+8VrY5EochZRgptTgPJ/vxZZtEhzZiGxgow20eY+UiuT3HI50zaeHf9nD/JcimvpGn2sYIDft3snl8XR5+4nDe+aI470rf6M+6NCxU/vuOF5w=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(396003)(346002)(39830400003)(136003)(366004)(376002)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(86362001)(38350700002)(36756003)(38100700002)(66946007)(6916009)(2906002)(30864003)(8936002)(478600001)(6486002)(6512007)(41300700001)(44832011)(5660300002)(4326008)(6506007)(52116002)(8676002)(83380400001)(107886003)(66556008)(66476007)(54906003)(26005)(2616005)(316002)(1076003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n 2WvQtRCwxZHkJNc5oVYPzoAkCK+WVKaP7/xCZe9TT3gvyECvSfE0+YdR8fHUJoaX5I9VZ3kzzIcBVuvWNI0zfb8SCbIOcQKllh8beT8pRcL2D0SmjN6Y9NAQeBGyJNZP4z05wBb2Mr46/Pi0ItuT4EndPo5ypPpJSEbdz98QAh+XL6A+K3nBGYF2wO9Z7GWwz6clMXb8oZKvGq5Z02npTElWwc/AXcDtmZ4DMW2UKtXihIxYOOcq9Kdq4Zs8y1wWESBucOWUy05RmRvSI2sQ0vVMdEEZNoJ/xcqE6y8z1McO94PugjrVzsRZCOQXPvSHbtp52d0VxUKn9eBq9MNtNFeFv7OLa/1xzCCEHq9gVNmwabxY12jjoz4g7oUXoDwGQICLC0krPnmI3n7h3NCZcnpDU+mAAk/vcnbBB9YQXgp7HOzG0YxaEeEw0Linis0OCb3WaJV5BSP10l8tajeflYYHKM1u6dLmLTKhDOCvkzlLjcYB1O+p7fOGDVAyuAiWFf3cFDL7Ynv3Li7qGhwYSRH39buXqCQMf9IZZOA4Gd8xIVetg2tHFNbejrIHkbVrdATJ+MRX9UqNha//VS1xd8rRhfcmUrMMZ24NEnNZuCd8rD32Cl8D+Nm1U4nn3puAraW4kg3NhJhZdRCpnfg9D+8BjrtWYzTOFncR6o30vbNVeeYJk5IBOR4/BTdVfqvX7TYjziOuVe0gAJP5BqH11vPjyXbO0a/sAhTq1HpTb2kOoyYz37vIR2on4n8F/YRY8IfdYIq483A59rEdN8bmvn7BagDsLq7j3XRLafUvMoDzUzVnbTEjh6UN5L2Ujy/5V2oV5vdTJlZgUQeV2aIKqsiempMgppLtyz+p6zjnbuRCqIueQox44VIVvM16+jvpaKdNapwD75gt/zJZc/74JL/74BV2MY9kwAmCnynnXaW+fEi/jPPpd/yxAXu7B3gZfYrMhISSzzya3UQl3vIZmqIUvtdHx0VElmXpNUMporNwmfI2RLWuftQV1Nu1rAgG5UHWkGqYxm/zriiMIVZ6HPbdHgPkUzfNg6aGqGGoXXmBpmz8ls9B+xSxb/JL7wfTNf1amZwZzau3rSqaRv7We4Q9eNA6KQ+5/hOHEtU/8jTkq1MuQvkAn+yHPkfYQ3nBhlLioacWgfcO00PhokTzkavw4p+KmKNmOIa26SZCXNiXA5nftBhkXd0tt+Lpi42B/VhUyYVlvBm4axhBZDy+OxE5bSX8WCLmh4MH3JlmVPSFHhll8b1q/nf9f56h/zAdrD0p9uQZNiRh/PS/G0zZF/G9GiDgf9mYeepMvtld9ffLvRuW8NCDATWIspS6YzAnDRXFAbY4E978VsPxhCNHLuh1Rt3sc5MI8vpfdGYZ1lUIS+jywWPL1VngHjLAj/DimOzd4rOaEmzr3mhWjox7kCs1f5ccKmWGW4TYD9A/G/irhIp0OE0GyxPN6Nq66LHpcPyJ7FvXSgNMgaM5sOdDScZygTbhfehcZYuq3ls3D5SEQXNiAliU9X4s3auZNTiG62mkhG+oZa7PwAumbaORn2lLpJ89NF0XTaGeXsfhd0eUdhVHIHsc3ZMitIKAB5NMSb0vAkqs3YaTp7aiFrmBEQ==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d2bc31d7-665e-41e0-5250-08dbcac273ac", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "12 Oct 2023 01:27:52.2475 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n YjRnWUgiIjTn+6qf3xg5+39FRe5j/FkhQW3yYZRbsK43S7NN7rnHYky5jVk6uDj/MxcId6nayFT4zoaYBsJh0kxxAPDZnEUPFel3NOoMXhI=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH0PR13MB5975", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "There should only declare one local variable in each line, and the local\nvariable should obey the unify sequence.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 6 +-\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 4 +-\n drivers/net/nfp/nfp_common.c | 97 ++++++++++++++++-------------\n drivers/net/nfp/nfp_common.h | 3 +-\n drivers/net/nfp/nfp_cpp_bridge.c | 39 ++++++++----\n drivers/net/nfp/nfp_ethdev.c | 47 +++++++-------\n drivers/net/nfp/nfp_ethdev_vf.c | 23 +++----\n drivers/net/nfp/nfp_flow.c | 28 ++++-----\n drivers/net/nfp/nfp_rxtx.c | 38 +++++------\n 9 files changed, 154 insertions(+), 131 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 7dd1423aaf..7a4e671178 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -24,9 +24,9 @@\n static void\n nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)\n {\n+\tuint16_t i;\n \tstruct nfp_net_hw *hw;\n \tuint64_t enabled_queues = 0;\n-\tuint16_t i;\n \tstruct nfp_flower_representor *repr;\n \n \trepr = dev->data->dev_private;\n@@ -50,9 +50,9 @@ nfp_pf_repr_enable_queues(struct rte_eth_dev *dev)\n static void\n nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\n {\n-\tstruct nfp_net_hw *hw;\n+\tuint32_t update;\n \tuint32_t new_ctrl;\n-\tuint32_t update = 0;\n+\tstruct nfp_net_hw *hw;\n \tstruct nfp_flower_representor *repr;\n \n \trepr = dev->data->dev_private;\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex 5a84629ed7..699f65ebef 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -228,13 +228,13 @@ nfp_net_nfd3_xmit_pkts_common(void *tx_queue,\n \t\tbool repr_flag)\n {\n \tuint16_t i;\n+\tuint8_t offset;\n \tuint32_t pkt_size;\n \tuint16_t dma_size;\n-\tuint8_t offset;\n \tuint64_t dma_addr;\n \tuint16_t free_descs;\n-\tuint16_t issued_descs;\n \tstruct rte_mbuf *pkt;\n+\tuint16_t issued_descs;\n \tstruct nfp_net_hw *hw;\n \tstruct rte_mbuf **lmbuf;\n \tstruct nfp_net_txq *txq;\ndiff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex cb2c2afbd7..18291a1cde 100644\n--- a/drivers/net/nfp/nfp_common.c\n+++ b/drivers/net/nfp/nfp_common.c\n@@ -375,10 +375,10 @@ nfp_net_mbox_reconfig(struct nfp_net_hw *hw,\n int\n nfp_net_configure(struct rte_eth_dev *dev)\n {\n+\tstruct nfp_net_hw *hw;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n \tstruct rte_eth_txmode *txmode;\n-\tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -464,9 +464,9 @@ nfp_net_enbable_rxvlan_cap(struct nfp_net_hw *hw,\n void\n nfp_net_enable_queues(struct rte_eth_dev *dev)\n {\n+\tuint16_t i;\n \tstruct nfp_net_hw *hw;\n \tuint64_t enabled_queues = 0;\n-\tuint16_t i;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -488,8 +488,9 @@ nfp_net_enable_queues(struct rte_eth_dev *dev)\n void\n nfp_net_disable_queues(struct rte_eth_dev *dev)\n {\n+\tuint32_t update;\n+\tuint32_t new_ctrl;\n \tstruct nfp_net_hw *hw;\n-\tuint32_t new_ctrl, update = 0;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -528,9 +529,10 @@ void\n nfp_net_write_mac(struct nfp_net_hw *hw,\n \t\tuint8_t *mac)\n {\n-\tuint32_t mac0 = *(uint32_t *)mac;\n+\tuint32_t mac0;\n \tuint16_t mac1;\n \n+\tmac0 = *(uint32_t *)mac;\n \tnn_writel(rte_cpu_to_be_32(mac0), hw->ctrl_bar + NFP_NET_CFG_MACADDR);\n \n \tmac += 4;\n@@ -543,8 +545,9 @@ int\n nfp_net_set_mac_addr(struct rte_eth_dev *dev,\n \t\tstruct rte_ether_addr *mac_addr)\n {\n+\tuint32_t ctrl;\n+\tuint32_t update;\n \tstruct nfp_net_hw *hw;\n-\tuint32_t update, ctrl;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n@@ -574,8 +577,8 @@ int\n nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\tstruct rte_intr_handle *intr_handle)\n {\n-\tstruct nfp_net_hw *hw;\n \tuint16_t i;\n+\tstruct nfp_net_hw *hw;\n \n \tif (rte_intr_vec_list_alloc(intr_handle, \"intr_vec\",\n \t\t\t\tdev->data->nb_rx_queues) != 0) {\n@@ -615,11 +618,11 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n uint32_t\n nfp_check_offloads(struct rte_eth_dev *dev)\n {\n+\tuint32_t ctrl = 0;\n \tstruct nfp_net_hw *hw;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n \tstruct rte_eth_txmode *txmode;\n-\tuint32_t ctrl = 0;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -682,9 +685,10 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n int\n nfp_net_promisc_enable(struct rte_eth_dev *dev)\n {\n-\tuint32_t new_ctrl, update = 0;\n-\tstruct nfp_net_hw *hw;\n \tint ret;\n+\tuint32_t new_ctrl;\n+\tuint32_t update = 0;\n+\tstruct nfp_net_hw *hw;\n \tstruct nfp_flower_representor *repr;\n \n \tPMD_DRV_LOG(DEBUG, \"Promiscuous mode enable\");\n@@ -725,9 +729,10 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n int\n nfp_net_promisc_disable(struct rte_eth_dev *dev)\n {\n-\tuint32_t new_ctrl, update = 0;\n-\tstruct nfp_net_hw *hw;\n \tint ret;\n+\tuint32_t new_ctrl;\n+\tuint32_t update = 0;\n+\tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -764,8 +769,8 @@ nfp_net_link_update(struct rte_eth_dev *dev,\n {\n \tint ret;\n \tuint32_t i;\n-\tuint32_t nn_link_status;\n \tstruct nfp_net_hw *hw;\n+\tuint32_t nn_link_status;\n \tstruct rte_eth_link link;\n \tstruct nfp_eth_table *nfp_eth_table;\n \n@@ -988,12 +993,13 @@ nfp_net_stats_reset(struct rte_eth_dev *dev)\n uint32_t\n nfp_net_xstats_size(const struct rte_eth_dev *dev)\n {\n-\t/* If the device is a VF, then there will be no MAC stats */\n-\tstruct nfp_net_hw *hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tuint32_t count;\n+\tstruct nfp_net_hw *hw;\n \tconst uint32_t size = RTE_DIM(nfp_net_xstats);\n \n+\t/* If the device is a VF, then there will be no MAC stats */\n+\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tif (hw->mac_stats == NULL) {\n-\t\tuint32_t count;\n \t\tfor (count = 0; count < size; count++) {\n \t\t\tif (nfp_net_xstats[count].group == NFP_XSTAT_GROUP_MAC)\n \t\t\t\tbreak;\n@@ -1396,9 +1402,9 @@ int\n nfp_rx_queue_intr_enable(struct rte_eth_dev *dev,\n \t\tuint16_t queue_id)\n {\n-\tstruct rte_pci_device *pci_dev;\n-\tstruct nfp_net_hw *hw;\n \tuint16_t base = 0;\n+\tstruct nfp_net_hw *hw;\n+\tstruct rte_pci_device *pci_dev;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n@@ -1417,9 +1423,9 @@ int\n nfp_rx_queue_intr_disable(struct rte_eth_dev *dev,\n \t\tuint16_t queue_id)\n {\n-\tstruct rte_pci_device *pci_dev;\n-\tstruct nfp_net_hw *hw;\n \tuint16_t base = 0;\n+\tstruct nfp_net_hw *hw;\n+\tstruct rte_pci_device *pci_dev;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n@@ -1436,8 +1442,8 @@ nfp_rx_queue_intr_disable(struct rte_eth_dev *dev,\n static void\n nfp_net_dev_link_status_print(struct rte_eth_dev *dev)\n {\n-\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_eth_link link;\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \n \trte_eth_linkstatus_get(dev, &link);\n \tif (link.link_status != 0)\n@@ -1573,16 +1579,16 @@ int\n nfp_net_vlan_offload_set(struct rte_eth_dev *dev,\n \t\tint mask)\n {\n-\tuint32_t new_ctrl, update;\n+\tint ret;\n+\tuint32_t update;\n+\tuint32_t new_ctrl;\n \tstruct nfp_net_hw *hw;\n+\tuint32_t rxvlan_ctrl = 0;\n \tstruct rte_eth_conf *dev_conf;\n-\tuint32_t rxvlan_ctrl;\n-\tint ret;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tdev_conf = &dev->data->dev_conf;\n \tnew_ctrl = hw->ctrl;\n-\trxvlan_ctrl = 0;\n \n \tnfp_net_enbable_rxvlan_cap(hw, &rxvlan_ctrl);\n \n@@ -1619,12 +1625,15 @@ nfp_net_rss_reta_write(struct rte_eth_dev *dev,\n \t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n \t\tuint16_t reta_size)\n {\n+\tuint16_t i;\n+\tuint16_t j;\n+\tuint16_t idx;\n \tuint8_t mask;\n \tuint32_t reta;\n-\tuint16_t i, j;\n-\tuint16_t idx, shift;\n-\tstruct nfp_net_hw *hw =\n-\t\tNFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tuint16_t shift;\n+\tstruct nfp_net_hw *hw;\n+\n+\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n \tif (reta_size != NFP_NET_CFG_RSS_ITBL_SZ) {\n \t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured \"\n@@ -1670,11 +1679,11 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n \t\tuint16_t reta_size)\n {\n-\tstruct nfp_net_hw *hw =\n-\t\tNFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n-\tuint32_t update;\n \tint ret;\n+\tuint32_t update;\n+\tstruct nfp_net_hw *hw;\n \n+\thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RSS_ANY) == 0)\n \t\treturn -EINVAL;\n \n@@ -1696,10 +1705,12 @@ nfp_net_reta_query(struct rte_eth_dev *dev,\n \t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n \t\tuint16_t reta_size)\n {\n-\tuint16_t i, j;\n+\tuint16_t i;\n+\tuint16_t j;\n+\tuint16_t idx;\n \tuint8_t mask;\n-\tuint16_t idx, shift;\n \tuint32_t reta;\n+\tuint16_t shift;\n \tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n@@ -1742,11 +1753,11 @@ static int\n nfp_net_rss_hash_write(struct rte_eth_dev *dev,\n \t\tstruct rte_eth_rss_conf *rss_conf)\n {\n-\tstruct nfp_net_hw *hw;\n+\tuint8_t i;\n+\tuint8_t key;\n \tuint64_t rss_hf;\n+\tstruct nfp_net_hw *hw;\n \tuint32_t cfg_rss_ctrl = 0;\n-\tuint8_t key;\n-\tuint8_t i;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -1834,10 +1845,10 @@ int\n nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \t\tstruct rte_eth_rss_conf *rss_conf)\n {\n+\tuint8_t i;\n+\tuint8_t key;\n \tuint64_t rss_hf;\n \tuint32_t cfg_rss_ctrl;\n-\tuint8_t key;\n-\tuint8_t i;\n \tstruct nfp_net_hw *hw;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n@@ -1890,13 +1901,14 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n int\n nfp_net_rss_config_default(struct rte_eth_dev *dev)\n {\n+\tint ret;\n+\tuint8_t i;\n+\tuint8_t j;\n+\tuint16_t queue = 0;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rss_conf rss_conf;\n-\tstruct rte_eth_rss_reta_entry64 nfp_reta_conf[2];\n \tuint16_t rx_queues = dev->data->nb_rx_queues;\n-\tuint16_t queue;\n-\tuint8_t i, j;\n-\tint ret;\n+\tstruct rte_eth_rss_reta_entry64 nfp_reta_conf[2];\n \n \tPMD_DRV_LOG(INFO, \"setting default RSS conf for %u queues\",\n \t\t\trx_queues);\n@@ -1904,7 +1916,6 @@ nfp_net_rss_config_default(struct rte_eth_dev *dev)\n \tnfp_reta_conf[0].mask = ~0x0;\n \tnfp_reta_conf[1].mask = ~0x0;\n \n-\tqueue = 0;\n \tfor (i = 0; i < 0x40; i += 8) {\n \t\tfor (j = i; j < (i + 8); j++) {\n \t\t\tnfp_reta_conf[0].reta[j] = queue;\ndiff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h\nindex 71153ea25b..9cb889c4a6 100644\n--- a/drivers/net/nfp/nfp_common.h\n+++ b/drivers/net/nfp/nfp_common.h\n@@ -222,8 +222,9 @@ nn_writew(uint16_t val,\n static inline uint64_t\n nn_readq(volatile void *addr)\n {\n+\tuint32_t low;\n+\tuint32_t high;\n \tconst volatile uint32_t *p = addr;\n-\tuint32_t low, high;\n \n \thigh = nn_readl((volatile const void *)(p + 1));\n \tlow = nn_readl((volatile const void *)p);\ndiff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c\nindex 85a8bf9235..727ec7a7b2 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.c\n+++ b/drivers/net/nfp/nfp_cpp_bridge.c\n@@ -119,12 +119,16 @@ static int\n nfp_cpp_bridge_serve_write(int sockfd,\n \t\tstruct nfp_cpp *cpp)\n {\n-\tstruct nfp_cpp_area *area;\n-\toff_t offset, nfp_offset;\n-\tuint32_t cpp_id, pos, len;\n+\tint err;\n+\toff_t offset;\n+\tuint32_t pos;\n+\tuint32_t len;\n+\tsize_t count;\n+\tsize_t curlen;\n+\tuint32_t cpp_id;\n+\toff_t nfp_offset;\n \tuint32_t tmpbuf[16];\n-\tsize_t count, curlen;\n-\tint err = 0;\n+\tstruct nfp_cpp_area *area;\n \n \tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\\n\", __func__,\n \t\t\tsizeof(off_t), sizeof(size_t));\n@@ -220,12 +224,16 @@ static int\n nfp_cpp_bridge_serve_read(int sockfd,\n \t\tstruct nfp_cpp *cpp)\n {\n-\tstruct nfp_cpp_area *area;\n-\toff_t offset, nfp_offset;\n-\tuint32_t cpp_id, pos, len;\n+\tint err;\n+\toff_t offset;\n+\tuint32_t pos;\n+\tuint32_t len;\n+\tsize_t count;\n+\tsize_t curlen;\n+\tuint32_t cpp_id;\n+\toff_t nfp_offset;\n \tuint32_t tmpbuf[16];\n-\tsize_t count, curlen;\n-\tint err = 0;\n+\tstruct nfp_cpp_area *area;\n \n \tPMD_CPP_LOG(DEBUG, \"%s: offset size %zu, count_size: %zu\\n\", __func__,\n \t\t\tsizeof(off_t), sizeof(size_t));\n@@ -319,8 +327,10 @@ static int\n nfp_cpp_bridge_serve_ioctl(int sockfd,\n \t\tstruct nfp_cpp *cpp)\n {\n-\tuint32_t cmd, ident_size, tmp;\n \tint err;\n+\tuint32_t cmd;\n+\tuint32_t tmp;\n+\tuint32_t ident_size;\n \n \t/* Reading now the IOCTL command */\n \terr = recv(sockfd, &cmd, 4, 0);\n@@ -375,10 +385,13 @@ nfp_cpp_bridge_serve_ioctl(int sockfd,\n static int\n nfp_cpp_bridge_service_func(void *args)\n {\n-\tstruct sockaddr address;\n+\tint op;\n+\tint ret;\n+\tint sockfd;\n+\tint datafd;\n \tstruct nfp_cpp *cpp;\n+\tstruct sockaddr address;\n \tstruct nfp_pf_dev *pf_dev;\n-\tint sockfd, datafd, op, ret;\n \tstruct timeval timeout = {1, 0};\n \n \tunlink(\"/tmp/nfp_cpp\");\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex 140d20dcf7..7d149decfb 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -25,8 +25,8 @@ static int\n nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic,\n \t\tuint16_t port)\n {\n+\tstruct nfp_net_hw *hw;\n \tstruct nfp_eth_table *nfp_eth_table;\n-\tstruct nfp_net_hw *hw = NULL;\n \n \t/* Grab a pointer to the correct physical port */\n \thw = app_fw_nic->ports[port];\n@@ -42,18 +42,19 @@ nfp_net_pf_read_mac(struct nfp_app_fw_nic *app_fw_nic,\n static int\n nfp_net_start(struct rte_eth_dev *dev)\n {\n-\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n-\tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n-\tuint32_t new_ctrl, update = 0;\n+\tint ret;\n+\tuint32_t new_ctrl;\n+\tuint32_t update = 0;\n \tuint32_t cap_extend;\n-\tuint32_t ctrl_extend = 0;\n+\tuint32_t intr_vector;\n \tstruct nfp_net_hw *hw;\n+\tuint32_t ctrl_extend = 0;\n \tstruct nfp_pf_dev *pf_dev;\n-\tstruct nfp_app_fw_nic *app_fw_nic;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n-\tuint32_t intr_vector;\n-\tint ret;\n+\tstruct nfp_app_fw_nic *app_fw_nic;\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpf_dev = NFP_NET_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n@@ -251,11 +252,11 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)\n static int\n nfp_net_close(struct rte_eth_dev *dev)\n {\n+\tuint8_t i;\n \tstruct nfp_net_hw *hw;\n-\tstruct rte_pci_device *pci_dev;\n \tstruct nfp_pf_dev *pf_dev;\n+\tstruct rte_pci_device *pci_dev;\n \tstruct nfp_app_fw_nic *app_fw_nic;\n-\tuint8_t i;\n \n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n \t\treturn 0;\n@@ -480,15 +481,15 @@ nfp_net_ethdev_ops_mount(struct nfp_net_hw *hw,\n static int\n nfp_net_init(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev;\n+\tint err;\n+\tuint16_t port;\n+\tuint64_t rx_base;\n+\tuint64_t tx_base;\n+\tstruct nfp_net_hw *hw;\n \tstruct nfp_pf_dev *pf_dev;\n+\tstruct rte_pci_device *pci_dev;\n \tstruct nfp_app_fw_nic *app_fw_nic;\n-\tstruct nfp_net_hw *hw;\n \tstruct rte_ether_addr *tmp_ether_addr;\n-\tuint64_t rx_base;\n-\tuint64_t tx_base;\n-\tuint16_t port = 0;\n-\tint err;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -650,14 +651,14 @@ nfp_fw_upload(struct rte_pci_device *dev,\n \t\tstruct nfp_nsp *nsp,\n \t\tchar *card)\n {\n-\tstruct nfp_cpp *cpp = nfp_nsp_cpp(nsp);\n \tvoid *fw_buf;\n-\tchar fw_name[125];\n-\tchar serial[40];\n \tsize_t fsize;\n+\tchar serial[40];\n+\tchar fw_name[125];\n \tuint16_t interface;\n \tuint32_t cpp_serial_len;\n \tconst uint8_t *cpp_serial;\n+\tstruct nfp_cpp *cpp = nfp_nsp_cpp(nsp);\n \n \tcpp_serial_len = nfp_cpp_serial(cpp, &cpp_serial);\n \tif (cpp_serial_len != NFP_SERIAL_LEN)\n@@ -713,10 +714,10 @@ nfp_fw_setup(struct rte_pci_device *dev,\n \t\tstruct nfp_eth_table *nfp_eth_table,\n \t\tstruct nfp_hwinfo *hwinfo)\n {\n+\tint err;\n+\tchar card_desc[100];\n \tstruct nfp_nsp *nsp;\n \tconst char *nfp_fw_model;\n-\tchar card_desc[100];\n-\tint err = 0;\n \n \tnfp_fw_model = nfp_hwinfo_lookup(hwinfo, \"nffw.partno\");\n \tif (nfp_fw_model == NULL)\n@@ -897,9 +898,9 @@ nfp_pf_init(struct rte_pci_device *pci_dev)\n \tuint64_t addr;\n \tuint32_t cpp_id;\n \tstruct nfp_cpp *cpp;\n-\tenum nfp_app_fw_id app_fw_id;\n \tstruct nfp_pf_dev *pf_dev;\n \tstruct nfp_hwinfo *hwinfo;\n+\tenum nfp_app_fw_id app_fw_id;\n \tchar name[RTE_ETH_NAME_MAX_LEN];\n \tstruct nfp_rtsym_table *sym_tbl;\n \tstruct nfp_eth_table *nfp_eth_table;\n@@ -1220,8 +1221,8 @@ static const struct rte_pci_id pci_id_nfp_pf_net_map[] = {\n static int\n nfp_pci_uninit(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev;\n \tuint16_t port_id;\n+\tstruct rte_pci_device *pci_dev;\n \n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 892300a909..aaef6ea91a 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -29,14 +29,15 @@ nfp_netvf_read_mac(struct nfp_net_hw *hw)\n static int\n nfp_netvf_start(struct rte_eth_dev *dev)\n {\n-\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n-\tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n-\tuint32_t new_ctrl, update = 0;\n+\tint ret;\n+\tuint32_t new_ctrl;\n+\tuint32_t update = 0;\n+\tuint32_t intr_vector;\n \tstruct nfp_net_hw *hw;\n \tstruct rte_eth_conf *dev_conf;\n \tstruct rte_eth_rxmode *rxmode;\n-\tuint32_t intr_vector;\n-\tint ret;\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rte_intr_handle *intr_handle = pci_dev->intr_handle;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -254,15 +255,15 @@ nfp_netvf_ethdev_ops_mount(struct nfp_net_hw *hw,\n static int\n nfp_netvf_init(struct rte_eth_dev *eth_dev)\n {\n-\tstruct rte_pci_device *pci_dev;\n-\tstruct nfp_net_hw *hw;\n-\tstruct rte_ether_addr *tmp_ether_addr;\n-\n-\tuint64_t tx_bar_off = 0, rx_bar_off = 0;\n+\tint err;\n \tuint32_t start_q;\n \tuint16_t port = 0;\n-\tint err;\n+\tstruct nfp_net_hw *hw;\n+\tuint64_t tx_bar_off = 0;\n+\tuint64_t rx_bar_off = 0;\n+\tstruct rte_pci_device *pci_dev;\n \tconst struct nfp_dev_info *dev_info;\n+\tstruct rte_ether_addr *tmp_ether_addr;\n \n \tPMD_INIT_FUNC_TRACE();\n \ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 4c9904e36c..84b48daf85 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -761,9 +761,9 @@ nfp_flow_compile_metadata(struct nfp_flow_priv *priv,\n \t\tuint32_t stats_ctx,\n \t\tuint64_t cookie)\n {\n-\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n-\tchar *mbuf_off_exact;\n \tchar *mbuf_off_mask;\n+\tchar *mbuf_off_exact;\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n \n \t/*\n \t * Convert to long words as firmware expects\n@@ -974,9 +974,9 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n \tint ret = 0;\n \tbool meter_flag = false;\n \tbool tc_hl_flag = false;\n-\tbool mac_set_flag = false;\n \tbool ip_set_flag = false;\n \tbool tp_set_flag = false;\n+\tbool mac_set_flag = false;\n \tbool ttl_tos_flag = false;\n \tconst struct rte_flow_action *action;\n \n@@ -3201,11 +3201,11 @@ nfp_flow_action_geneve_encap_v4(struct nfp_app_fw_flower *app_fw_flower,\n {\n \tuint64_t tun_id;\n \tconst struct rte_ether_hdr *eth;\n+\tstruct nfp_fl_act_pre_tun *pre_tun;\n+\tstruct nfp_fl_act_set_tun *set_tun;\n \tconst struct rte_flow_item_udp *udp;\n \tconst struct rte_flow_item_ipv4 *ipv4;\n \tconst struct rte_flow_item_geneve *geneve;\n-\tstruct nfp_fl_act_pre_tun *pre_tun;\n-\tstruct nfp_fl_act_set_tun *set_tun;\n \tsize_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun);\n \tsize_t act_set_size = sizeof(struct nfp_fl_act_set_tun);\n \n@@ -3241,11 +3241,11 @@ nfp_flow_action_geneve_encap_v6(struct nfp_app_fw_flower *app_fw_flower,\n \tuint8_t tos;\n \tuint64_t tun_id;\n \tconst struct rte_ether_hdr *eth;\n+\tstruct nfp_fl_act_pre_tun *pre_tun;\n+\tstruct nfp_fl_act_set_tun *set_tun;\n \tconst struct rte_flow_item_udp *udp;\n \tconst struct rte_flow_item_ipv6 *ipv6;\n \tconst struct rte_flow_item_geneve *geneve;\n-\tstruct nfp_fl_act_pre_tun *pre_tun;\n-\tstruct nfp_fl_act_set_tun *set_tun;\n \tsize_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun);\n \tsize_t act_set_size = sizeof(struct nfp_fl_act_set_tun);\n \n@@ -3281,10 +3281,10 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower,\n {\n \tuint64_t tun_id;\n \tconst struct rte_ether_hdr *eth;\n-\tconst struct rte_flow_item_ipv4 *ipv4;\n-\tconst struct rte_flow_item_gre *gre;\n \tstruct nfp_fl_act_pre_tun *pre_tun;\n \tstruct nfp_fl_act_set_tun *set_tun;\n+\tconst struct rte_flow_item_gre *gre;\n+\tconst struct rte_flow_item_ipv4 *ipv4;\n \tsize_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun);\n \tsize_t act_set_size = sizeof(struct nfp_fl_act_set_tun);\n \n@@ -3319,10 +3319,10 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower,\n \tuint8_t tos;\n \tuint64_t tun_id;\n \tconst struct rte_ether_hdr *eth;\n-\tconst struct rte_flow_item_ipv6 *ipv6;\n-\tconst struct rte_flow_item_gre *gre;\n \tstruct nfp_fl_act_pre_tun *pre_tun;\n \tstruct nfp_fl_act_set_tun *set_tun;\n+\tconst struct rte_flow_item_gre *gre;\n+\tconst struct rte_flow_item_ipv6 *ipv6;\n \tsize_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun);\n \tsize_t act_set_size = sizeof(struct nfp_fl_act_set_tun);\n \n@@ -3467,12 +3467,12 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor,\n \tuint32_t count;\n \tchar *position;\n \tchar *action_data;\n-\tbool ttl_tos_flag = false;\n-\tbool tc_hl_flag = false;\n \tbool drop_flag = false;\n+\tbool tc_hl_flag = false;\n \tbool ip_set_flag = false;\n \tbool tp_set_flag = false;\n \tbool mac_set_flag = false;\n+\tbool ttl_tos_flag = false;\n \tuint32_t total_actions = 0;\n \tconst struct rte_flow_action *action;\n \tstruct nfp_flower_meta_tci *meta_tci;\n@@ -4283,10 +4283,10 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)\n \tsize_t stats_size;\n \tuint64_t ctx_count;\n \tuint64_t ctx_split;\n+\tstruct nfp_flow_priv *priv;\n \tchar mask_name[RTE_HASH_NAMESIZE];\n \tchar flow_name[RTE_HASH_NAMESIZE];\n \tchar pretun_name[RTE_HASH_NAMESIZE];\n-\tstruct nfp_flow_priv *priv;\n \tstruct nfp_app_fw_flower *app_fw_flower;\n \tconst char *pci_name = strchr(pf_dev->pci_dev->name, ':') + 1;\n \ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex 8cbb9b74a2..db6122eac3 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -188,9 +188,9 @@ nfp_net_rx_cksum(struct nfp_net_rxq *rxq,\n static int\n nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)\n {\n-\tstruct nfp_net_dp_buf *rxe = rxq->rxbufs;\n-\tuint64_t dma_addr;\n \tuint16_t i;\n+\tuint64_t dma_addr;\n+\tstruct nfp_net_dp_buf *rxe = rxq->rxbufs;\n \n \tPMD_RX_LOG(DEBUG, \"Fill Rx Freelist for %u descriptors\",\n \t\t\trxq->rx_count);\n@@ -241,17 +241,15 @@ nfp_net_rx_freelist_setup(struct rte_eth_dev *dev)\n uint32_t\n nfp_net_rx_queue_count(void *rx_queue)\n {\n+\tuint32_t idx;\n+\tuint32_t count = 0;\n \tstruct nfp_net_rxq *rxq;\n \tstruct nfp_net_rx_desc *rxds;\n-\tuint32_t idx;\n-\tuint32_t count;\n \n \trxq = rx_queue;\n \n \tidx = rxq->rd_p;\n \n-\tcount = 0;\n-\n \t/*\n \t * Other PMDs are just checking the DD bit in intervals of 4\n \t * descriptors and counting all four if the first has the DD\n@@ -282,9 +280,9 @@ nfp_net_parse_chained_meta(uint8_t *meta_base,\n \t\trte_be32_t meta_header,\n \t\tstruct nfp_meta_parsed *meta)\n {\n-\tuint8_t *meta_offset;\n \tuint32_t meta_info;\n \tuint32_t vlan_info;\n+\tuint8_t *meta_offset;\n \n \tmeta_info = rte_be_to_cpu_32(meta_header);\n \tmeta_offset = meta_base + 4;\n@@ -683,15 +681,15 @@ nfp_net_recv_pkts(void *rx_queue,\n \t\tstruct rte_mbuf **rx_pkts,\n \t\tuint16_t nb_pkts)\n {\n-\tstruct nfp_net_rxq *rxq;\n-\tstruct nfp_net_rx_desc *rxds;\n-\tstruct nfp_net_dp_buf *rxb;\n-\tstruct nfp_net_hw *hw;\n+\tuint64_t dma_addr;\n+\tuint16_t avail = 0;\n \tstruct rte_mbuf *mb;\n+\tuint16_t nb_hold = 0;\n+\tstruct nfp_net_hw *hw;\n \tstruct rte_mbuf *new_mb;\n-\tuint16_t nb_hold;\n-\tuint64_t dma_addr;\n-\tuint16_t avail;\n+\tstruct nfp_net_rxq *rxq;\n+\tstruct nfp_net_dp_buf *rxb;\n+\tstruct nfp_net_rx_desc *rxds;\n \tuint16_t avail_multiplexed = 0;\n \n \trxq = rx_queue;\n@@ -706,8 +704,6 @@ nfp_net_recv_pkts(void *rx_queue,\n \n \thw = rxq->hw;\n \n-\tavail = 0;\n-\tnb_hold = 0;\n \twhile (avail + avail_multiplexed < nb_pkts) {\n \t\trxb = &rxq->rxbufs[rxq->rd_p];\n \t\tif (unlikely(rxb == NULL)) {\n@@ -883,12 +879,12 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tconst struct rte_eth_rxconf *rx_conf,\n \t\tstruct rte_mempool *mp)\n {\n+\tuint32_t rx_desc_sz;\n \tuint16_t min_rx_desc;\n \tuint16_t max_rx_desc;\n-\tconst struct rte_memzone *tz;\n-\tstruct nfp_net_rxq *rxq;\n \tstruct nfp_net_hw *hw;\n-\tuint32_t rx_desc_sz;\n+\tstruct nfp_net_rxq *rxq;\n+\tconst struct rte_memzone *tz;\n \n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \n@@ -995,8 +991,8 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n uint32_t\n nfp_net_tx_free_bufs(struct nfp_net_txq *txq)\n {\n-\tuint32_t qcp_rd_p;\n \tuint32_t todo;\n+\tuint32_t qcp_rd_p;\n \n \tPMD_TX_LOG(DEBUG, \"queue %hu. Check for descriptor with a complete\"\n \t\t\t\" status\", txq->qidx);\n@@ -1072,8 +1068,8 @@ nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data,\n \t\tstruct rte_mbuf *pkt,\n \t\tuint8_t layer)\n {\n-\tuint16_t vlan_tci;\n \tuint16_t tpid;\n+\tuint16_t vlan_tci;\n \n \ttpid = RTE_ETHER_TYPE_VLAN;\n \tvlan_tci = pkt->vlan_tci;\n", "prefixes": [ "v2", "04/11" ] }