Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132559/?format=api
{ "id": 132559, "url": "http://patchwork.dpdk.org/api/patches/132559/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231012012704.483828-2-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-2-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231012012704.483828-2-chaoyong.he@corigine.com", "date": "2023-10-12T01:26:54", "name": "[v2,01/11] net/nfp: explicitly compare to null and 0", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c44a0c1abc5359a90d1a17e45b28ebfe202fc07d", "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-2-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/132559/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132559/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 C3B984236A;\n\tThu, 12 Oct 2023 03:27:50 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E4706402E8;\n\tThu, 12 Oct 2023 03:27:47 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2138.outbound.protection.outlook.com [40.107.220.138])\n by mails.dpdk.org (Postfix) with ESMTP id 8CE6E402E4\n for <dev@dpdk.org>; Thu, 12 Oct 2023 03:27:46 +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:44 +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:44 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=IEcVXpz6tO1F24o43QxyCzw3cLyY7dpsAP9QkVM1+XWSJjpcl04FvkHGsmGQ/Dx1WZFUe4XpXFRFeyrIfwoMrkoJAoTmW5ONfw1CY35ft0nWN4JT5trIEoZGNTtXH2WWaQcNWQJ80/8OJWebJ0a4xgJhd3lu4Er4nPtebMNyWMJM3IIDMsgsTzKw7GGU83F4WZbssXM1X/tGVbghKGJ+V7ymzW9ce868BscAFLVrMU4EjUJaRIghM6G5v9wm0QYpZkfwIa7c4YYNAL+ydrYoEnDHK8SdXhBwp0OGostg7PpHhcoXOPQ/5qaUKGyDDi+mZ5FtQZleOjZ9x3CibA+eWA==", "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=/Ml30Z+dRZrzA4yl83XpKwDJqr6r22NKxfwu4cYAkCU=;\n b=RT1m1s83KFQtTpY3i5Io8lkTTHCYp+/medfxyib0HsUn7syQ4PAnW/3llD4l94cAi0hiBDy7KNEzLrJKrhox4nczUvGT6CtsNir+pCGp4pTn5Q+MByWkQHWmV+FsP+FQieclX24W7ufXtR5gI67VFghWrl4u88pHpdhRje3d8F5S/Sna8QXQ7i3PQR6DwEZdUz6un9DulPZ5gdcaXdeEaMUntI9XIs4b3khhJx+3JZFINx1asf1rqXkDJLCaqDvAOwP+MDO3CNtMGMFQIgRRlD1btEbGn39E5O2S8UAh/II6azYrS7hGR5WpipZKf7movD3FYFclfKMCSP5CPk62FQ==", "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=/Ml30Z+dRZrzA4yl83XpKwDJqr6r22NKxfwu4cYAkCU=;\n b=qpT0euDYSVv/exzjr38+ehtleWSS3OABemwHFGL/NJQa2HGY5C9q/t6Fin9tATR41Fmj8TuATYn/o4hPuW6ECp8CGRRhGeivfgdRNb9K5wdLWB3mDlloxA8zSBuuma6bxKCHDUkIqHgecS5oFM8UGjujl8LCYlyYf6ZZtw14UwE=", "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 01/11] net/nfp: explicitly compare to null and 0", "Date": "Thu, 12 Oct 2023 09:26:54 +0800", "Message-Id": "<20231012012704.483828-2-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": "7feda9f6-6451-467f-2eb7-08dbcac26eb8", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 45bqR78YQU72iezgBXukTmRyQl4dLUoYrr8cx8GHrdxItyCO6eRD5ni90pLoudFsZjpiQSAktOGzxGWM5p3/jGrps8xSSgJt0QY+6SmxYg1UWAxOqcH6GMOBnwZNJmdqGtzrxEENpml/EpxqTM4VcNb0ML4j3ZhHpngLytrkmseuNnkaNzfzQ//rK+z9+QpVfyNo+grUIM4VKHIkeqYqT3EdoXKplc60LiXNPCipOxGooW35xTCQ5GaIYriNK4bfRX4+GWa/3g8RfAltUxbKqjkD0V64JqSL42uldFysDfQ+Zbjq43HsrfexZw608XWAfcnXDKptHQKv2c27zEr0CMvy/EtCIjr38LoFHQzBzTv9JaXSQcPzBUibAJhrA0a9E51WGNxOc1BilMQ6eaRjWPNc0le+timtrWSWjJ6FISCRD+i+7nCZ2ngn+gY+iaJhqn7Kg/oUkRmnMIBjax01Ht2dX1CCI2P4LTlGdVngg/eSfnn0tjZ89DNoyVr9JoTlkXSQBjaQOH1X4jdTupIcBdmCkD2wyAe18Ls66TXAGGuZQ5d1oiJtTi7tE41qX2uyIo1su4pQOMFmQk/lXe8QSnkmYwHCY6S12ver1EACwuYXjvqWcUubK00qlJDm7fJjTRefVN7hjnuSw+BDZFVIMTzy/OsGhXH6W16ON0HcUHo=", "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)(6666004)(83380400001)(107886003)(66556008)(66476007)(54906003)(26005)(2616005)(316002)(1076003)(579004);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n 2OumHbGC+3zo+LHG52bblGRxZYWDqQ/tbgjvCsozxIHG4qLnJXYKsFQl6vnqaZe1UG3ZwUSvQ14WSHdiSFebEqg9UFSYKhZYbFWaO/u8osWJnP5EKNjqYl8V8kmhGIaeGnR7cg6AOVt7MO1x8kcMEQHFgGT5tpp63+fEpHkwoQLJIfINasI4rgL3WBOPxzrfWI+rEBae6d5ip9ebK+JaguJjrUMDR2J6UfCBHgLXozjDLxhNFIZXnVd/LAhNT5wj9kIh3K/Ee+FtOpbUVoYSaDF+1XV3wHGyfELxoHn9FUi6lCFXrHKgmq4yvq7lTR+sMjjbXgnFtUWLNyW/ncoqjjaXWBTDJ/8GVhcNMYPNP/js4GBwLAtidsPC0+4nbfCeGeHRLL0jSjWvtqnsAs+zwA746tupgFLrpOHgjZAQAA8MmcZ9w2bJH/wZBuaEAuUz0+WVQYt6zcxggquJrlkai1cszOWd+GjYosO2g66tvlrIK+3+2Ny9p8e87glPqfItQLNFzP18UGG6eCssYN3wIdZaGQAw/L4HZPbQKyraEDgxlWacf0bZ+bPTTDK5vEn/phOtd4mSCbTP+IJugXaNGNVw1s9p2iozgPpTuDuknt6ZzkN80DoUJzSUqR2fjWMU8ZyfwOab3ftl065JBKz+CG+7R/7OyW6MHaHyC7L3+AtIAUK2iDIJKaIaEJvDaNS2Rf1TDRviXDBDI+LYsd6YIvM+Mq1qW0rEfpHnwfvid9fPukikD410PUP3RGSK85FNXo/4YbbX4Roy8zlAtUaCdV7Mp1HV0sWsjPE+MhN2Jkz1QGHjFTCJXUTjkPTir3siQ+RKhy9eIRI0mpNAo8tW7JmRuqwQElmJIHdEeB7Zev1xsFru3JkA3QNdWb5AvmDPsGlaCox8Sz9u7BSsBcvoIQFthF3Kij9Q8D9q7vfjrg7UtGGp6u229RhcQZ9lI4AukjaIdMCmEJbd8Zu8rDlmQKcToDidzDTelaILH/CLZEAls7UCPxk3Q7o6rG9gWAD5ueuic+GtKbEd0NuO7NRUSGdIRKLHF0La7YQ/8hbjlCJjcCdvvpgTC+g7ikoSU4iUJXJxcek3UWwdgUkGM1/ff/N8uC91Q2AOkdU1nKKi4HFFJZnHKS7O7JwFSZW1MqgSiy0ip9wgUxi8JGlWHT5gQ8L8IffsoSGZERViwlVbEkqa6zaiO8f2u8ow1o71hhqVa3FGxGV1MZ2FpJo9lZIaGdS1quFKS2TTGaizvEvAfnb4gz4m/p0NpR+3+INcu1hi0ld6xfu+mDbCu4fL8QDJb/+eab6+kCi6O0UhJvhoFfjjwqo4ZbGUxvqfI+MwwEmfs4TIM+HPZCTw8EmAn1Acyt/zgt4FLK33+Hrru+yPJ4LDQpPLiJX5r/xw3ipmdo81Ed+J/vdoEIGqR5dFkIIxlBL2ru4GrY+2FSWRc2zE9Spi4JvrmBIujBThHPtdHDWg8kiE8z+W+rKmFwaZBCYyyO+QlYFHUG3ljCdngTUjnqzP31SvPHVDzwfyFmqs146zTipRAAMsxIaa5mBooFVOZy8nuZI1zGC0KGGOQWy8Ypnad+PS3fLVVZ8YEXA/G3Vnre1VsQJQsWqjhC6ssw0jiw==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7feda9f6-6451-467f-2eb7-08dbcac26eb8", "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:44.0418 (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 cfmYyVNnyMEUVrXk2E6L48BCKilJrx3Lpgo3Wo1Aub3cWcOZjHLQHGb+28uLpHjfnIAhIL4Jbj6qw6iQbNaY0ArXIz3SvksnKYEu8SzxgUM=", "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": "To compliance with the coding standard, make the pointer variable\nexplicitly comparing to 'NULL' and the integer variable explicitly\ncomparing to '0'.\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/flower/nfp_flower_ctrl.c | 6 +-\n drivers/net/nfp/nfp_common.c | 144 +++++++++++------------\n drivers/net/nfp/nfp_cpp_bridge.c | 2 +-\n drivers/net/nfp/nfp_ethdev.c | 38 +++---\n drivers/net/nfp/nfp_ethdev_vf.c | 14 +--\n drivers/net/nfp/nfp_flow.c | 90 +++++++-------\n drivers/net/nfp/nfp_rxtx.c | 28 ++---\n 8 files changed, 165 insertions(+), 163 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 98e6f7f927..3ddaf0f28d 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -69,7 +69,7 @@ nfp_pf_repr_disable_queues(struct rte_eth_dev *dev)\n \t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;\n \n \t/* If an error when reconfig we avoid to change hw state */\n-\tif (nfp_net_reconfig(hw, new_ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn;\n \n \thw->ctrl = new_ctrl;\n@@ -100,7 +100,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_RSS;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RSS2)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RSS2) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS2;\n \telse\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RSS;\n@@ -110,7 +110,7 @@ nfp_flower_pf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n \tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\ndiff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c\nindex c5282053cf..b564e7cd73 100644\n--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c\n+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c\n@@ -103,7 +103,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue,\n \t\t}\n \n \t\t/* Filling the received mbuf with packet info */\n-\t\tif (hw->rx_offset)\n+\t\tif (hw->rx_offset != 0)\n \t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM + hw->rx_offset;\n \t\telse\n \t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM + NFP_DESC_META_LEN(rxds);\n@@ -195,7 +195,7 @@ nfp_flower_ctrl_vnic_nfd3_xmit(struct nfp_app_fw_flower *app_fw_flower,\n \n \tlmbuf = &txq->txbufs[txq->wr_p].mbuf;\n \tRTE_MBUF_PREFETCH_TO_FREE(*lmbuf);\n-\tif (*lmbuf)\n+\tif (*lmbuf != NULL)\n \t\trte_pktmbuf_free_seg(*lmbuf);\n \n \t*lmbuf = mbuf;\n@@ -337,7 +337,7 @@ nfp_flower_ctrl_vnic_nfdk_xmit(struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n \ttxq->wr_p = D_IDX(txq, txq->wr_p + used_descs);\n-\tif (txq->wr_p % NFDK_TX_DESC_BLOCK_CNT)\n+\tif (txq->wr_p % NFDK_TX_DESC_BLOCK_CNT != 0)\n \t\ttxq->data_pending += mbuf->pkt_len;\n \telse\n \t\ttxq->data_pending = 0;\ndiff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c\nindex 5683afc40a..36752583dd 100644\n--- a/drivers/net/nfp/nfp_common.c\n+++ b/drivers/net/nfp/nfp_common.c\n@@ -221,7 +221,7 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update)\n \t\tnew = nn_cfg_readl(hw, NFP_NET_CFG_UPDATE);\n \t\tif (new == 0)\n \t\t\tbreak;\n-\t\tif (new & NFP_NET_CFG_UPDATE_ERR) {\n+\t\tif ((new & NFP_NET_CFG_UPDATE_ERR) != 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"Reconfig error: 0x%08x\", new);\n \t\t\treturn -1;\n \t\t}\n@@ -390,18 +390,18 @@ nfp_net_configure(struct rte_eth_dev *dev)\n \trxmode = &dev_conf->rxmode;\n \ttxmode = &dev_conf->txmode;\n \n-\tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)\n+\tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0)\n \t\trxmode->offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;\n \n \t/* Checking TX mode */\n-\tif (txmode->mq_mode) {\n+\tif (txmode->mq_mode != RTE_ETH_MQ_TX_NONE) {\n \t\tPMD_INIT_LOG(INFO, \"TX mq_mode DCB and VMDq not supported\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Checking RX mode */\n-\tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG &&\n-\t !(hw->cap & NFP_NET_CFG_CTRL_RSS_ANY)) {\n+\tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0 &&\n+\t (hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"RSS not supported\");\n \t\treturn -EINVAL;\n \t}\n@@ -493,11 +493,11 @@ nfp_net_disable_queues(struct rte_eth_dev *dev)\n \tupdate = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING |\n \t\t NFP_NET_CFG_UPDATE_MSIX;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RINGCFG;\n \n \t/* If an error when reconfig we avoid to change hw state */\n-\tif (nfp_net_reconfig(hw, new_ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn;\n \n \thw->ctrl = new_ctrl;\n@@ -537,8 +537,8 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)\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) &&\n-\t !(hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) {\n+\tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n+\t (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"MAC address unable to change when\"\n \t\t\t\t \" port enabled\");\n \t\treturn -EBUSY;\n@@ -550,10 +550,10 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)\n \t/* Signal the NIC about the change */\n \tupdate = NFP_NET_CFG_UPDATE_MACADDR;\n \tctrl = hw->ctrl;\n-\tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) &&\n-\t (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR))\n+\tif ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 &&\n+\t (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR;\n-\tif (nfp_net_reconfig(hw, ctrl, update) < 0) {\n+\tif (nfp_net_reconfig(hw, ctrl, update) != 0) {\n \t\tPMD_INIT_LOG(INFO, \"MAC address update failed\");\n \t\treturn -EIO;\n \t}\n@@ -568,7 +568,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \tint i;\n \n \tif (rte_intr_vec_list_alloc(intr_handle, \"intr_vec\",\n-\t\t\t\t dev->data->nb_rx_queues)) {\n+\t\t\t\t dev->data->nb_rx_queues) != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to allocate %d rx_queues\"\n \t\t\t \" intr_vec\", dev->data->nb_rx_queues);\n \t\treturn -ENOMEM;\n@@ -580,7 +580,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\tPMD_INIT_LOG(INFO, \"VF: enabling RX interrupt with UIO\");\n \t\t/* UIO just supports one queue and no LSC*/\n \t\tnn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(0), 0);\n-\t\tif (rte_intr_vec_list_index_set(intr_handle, 0, 0))\n+\t\tif (rte_intr_vec_list_index_set(intr_handle, 0, 0) != 0)\n \t\t\treturn -1;\n \t} else {\n \t\tPMD_INIT_LOG(INFO, \"VF: enabling RX interrupt with VFIO\");\n@@ -591,7 +591,7 @@ nfp_configure_rx_interrupt(struct rte_eth_dev *dev,\n \t\t\t*/\n \t\t\tnn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(i), i + 1);\n \t\t\tif (rte_intr_vec_list_index_set(intr_handle, i,\n-\t\t\t\t\t\t\t i + 1))\n+\t\t\t\t\t\t\t i + 1) != 0)\n \t\t\t\treturn -1;\n \t\t\tPMD_INIT_LOG(DEBUG, \"intr_vec[%d]= %d\", i,\n \t\t\t\trte_intr_vec_list_index_get(intr_handle,\n@@ -619,53 +619,53 @@ nfp_check_offloads(struct rte_eth_dev *dev)\n \trxmode = &dev_conf->rxmode;\n \ttxmode = &dev_conf->txmode;\n \n-\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) {\n-\t\tif (hw->cap & NFP_NET_CFG_CTRL_RXCSUM)\n+\tif ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_IPV4_CKSUM) != 0) {\n+\t\tif ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_RXCSUM;\n \t}\n \n-\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n+\tif ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)\n \t\tnfp_net_enbable_rxvlan_cap(hw, &ctrl);\n \n-\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) {\n-\t\tif (hw->cap & NFP_NET_CFG_CTRL_RXQINQ)\n+\tif ((rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0) {\n+\t\tif ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_RXQINQ;\n \t}\n \n \thw->mtu = dev->data->mtu;\n \n-\tif (txmode->offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) {\n-\t\tif (hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2)\n+\tif ((txmode->offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT) != 0) {\n+\t\tif ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_TXVLAN_V2;\n-\t\telse if (hw->cap & NFP_NET_CFG_CTRL_TXVLAN)\n+\t\telse if ((hw->cap & NFP_NET_CFG_CTRL_TXVLAN) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_TXVLAN;\n \t}\n \n \t/* L2 broadcast */\n-\tif (hw->cap & NFP_NET_CFG_CTRL_L2BC)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_L2BC) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_L2BC;\n \n \t/* L2 multicast */\n-\tif (hw->cap & NFP_NET_CFG_CTRL_L2MC)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_L2MC) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_L2MC;\n \n \t/* TX checksum offload */\n-\tif (txmode->offloads & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM ||\n-\t txmode->offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM ||\n-\t txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM)\n+\tif ((txmode->offloads & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM) != 0 ||\n+\t (txmode->offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) != 0 ||\n+\t (txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_TXCSUM;\n \n \t/* LSO offload */\n-\tif (txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_TSO ||\n-\t txmode->offloads & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) {\n-\t\tif (hw->cap & NFP_NET_CFG_CTRL_LSO)\n+\tif ((txmode->offloads & RTE_ETH_TX_OFFLOAD_TCP_TSO) != 0 ||\n+\t (txmode->offloads & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO) != 0) {\n+\t\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO) != 0)\n \t\t\tctrl |= NFP_NET_CFG_CTRL_LSO;\n \t\telse\n \t\t\tctrl |= NFP_NET_CFG_CTRL_LSO2;\n \t}\n \n \t/* RX gather */\n-\tif (txmode->offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)\n+\tif ((txmode->offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS) != 0)\n \t\tctrl |= NFP_NET_CFG_CTRL_GATHER;\n \n \treturn ctrl;\n@@ -693,7 +693,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t\treturn -ENOTSUP;\n \t}\n \n-\tif (hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) {\n+\tif ((hw->ctrl & NFP_NET_CFG_CTRL_PROMISC) != 0) {\n \t\tPMD_DRV_LOG(INFO, \"Promiscuous mode already enabled\");\n \t\treturn 0;\n \t}\n@@ -706,7 +706,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)\n \t * it can not fail ...\n \t */\n \tret = nfp_net_reconfig(hw, new_ctrl, update);\n-\tif (ret < 0)\n+\tif (ret != 0)\n \t\treturn ret;\n \n \thw->ctrl = new_ctrl;\n@@ -736,7 +736,7 @@ nfp_net_promisc_disable(struct rte_eth_dev *dev)\n \t * assuming it can not fail ...\n \t */\n \tret = nfp_net_reconfig(hw, new_ctrl, update);\n-\tif (ret < 0)\n+\tif (ret != 0)\n \t\treturn ret;\n \n \thw->ctrl = new_ctrl;\n@@ -770,7 +770,7 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)\n \n \tmemset(&link, 0, sizeof(struct rte_eth_link));\n \n-\tif (nn_link_status & NFP_NET_CFG_STS_LINK)\n+\tif ((nn_link_status & NFP_NET_CFG_STS_LINK) != 0)\n \t\tlink.link_status = RTE_ETH_LINK_UP;\n \n \tlink.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;\n@@ -802,7 +802,7 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)\n \n \tret = rte_eth_linkstatus_set(dev, &link);\n \tif (ret == 0) {\n-\t\tif (link.link_status)\n+\t\tif (link.link_status != 0)\n \t\t\tPMD_DRV_LOG(INFO, \"NIC Link is Up\");\n \t\telse\n \t\t\tPMD_DRV_LOG(INFO, \"NIC Link is Down\");\n@@ -907,7 +907,7 @@ nfp_net_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \n \tnfp_dev_stats.imissed -= hw->eth_stats_base.imissed;\n \n-\tif (stats) {\n+\tif (stats != NULL) {\n \t\tmemcpy(stats, &nfp_dev_stats, sizeof(*stats));\n \t\treturn 0;\n \t}\n@@ -1229,32 +1229,32 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t/* Next should change when PF support is implemented */\n \tdev_info->max_mac_addrs = 1;\n \n-\tif (hw->cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2))\n+\tif ((hw->cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) != 0)\n \t\tdev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RXQINQ)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RXQINQ) != 0)\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_QINQ_STRIP;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RXCSUM)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RXCSUM) != 0)\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\t\t RTE_ETH_RX_OFFLOAD_UDP_CKSUM |\n \t\t\t\t\t RTE_ETH_RX_OFFLOAD_TCP_CKSUM;\n \n-\tif (hw->cap & (NFP_NET_CFG_CTRL_TXVLAN | NFP_NET_CFG_CTRL_TXVLAN_V2))\n+\tif ((hw->cap & (NFP_NET_CFG_CTRL_TXVLAN | NFP_NET_CFG_CTRL_TXVLAN_V2)) != 0)\n \t\tdev_info->tx_offload_capa = RTE_ETH_TX_OFFLOAD_VLAN_INSERT;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_TXCSUM)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_TXCSUM) != 0)\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |\n \t\t\t\t\t RTE_ETH_TX_OFFLOAD_UDP_CKSUM |\n \t\t\t\t\t RTE_ETH_TX_OFFLOAD_TCP_CKSUM;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) {\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO_ANY) != 0) {\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_TCP_TSO;\n-\t\tif (hw->cap & NFP_NET_CFG_CTRL_VXLAN)\n+\t\tif ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0)\n \t\t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO;\n \t}\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_GATHER)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_GATHER) != 0)\n \t\tdev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_MULTI_SEGS;\n \n \tcap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);\n@@ -1297,7 +1297,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \t\t.nb_mtu_seg_max = NFP_TX_MAX_MTU_SEG,\n \t};\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) {\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RSS_ANY) != 0) {\n \t\tdev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_RSS_HASH;\n \n \t\tdev_info->flow_type_rss_offloads = RTE_ETH_RSS_IPV4 |\n@@ -1431,7 +1431,7 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev)\n \tstruct rte_eth_link link;\n \n \trte_eth_linkstatus_get(dev, &link);\n-\tif (link.link_status)\n+\tif (link.link_status != 0)\n \t\tPMD_DRV_LOG(INFO, \"Port %d: Link Up - speed %u Mbps - %s\",\n \t\t\t dev->data->port_id, link.link_speed,\n \t\t\t link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX\n@@ -1462,7 +1462,7 @@ nfp_net_irq_unmask(struct rte_eth_dev *dev)\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tpci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \n-\tif (hw->ctrl & NFP_NET_CFG_CTRL_MSIXAUTO) {\n+\tif ((hw->ctrl & NFP_NET_CFG_CTRL_MSIXAUTO) != 0) {\n \t\t/* If MSI-X auto-masking is used, clear the entry */\n \t\trte_wmb();\n \t\trte_intr_ack(pci_dev->intr_handle);\n@@ -1524,7 +1524,7 @@ nfp_net_dev_interrupt_handler(void *param)\n \n \tif (rte_eal_alarm_set(timeout * 1000,\n \t\t\t nfp_net_dev_interrupt_delayed_handler,\n-\t\t\t (void *)dev) < 0) {\n+\t\t\t (void *)dev) != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Error setting alarm\");\n \t\t/* Unmasking */\n \t\tnfp_net_irq_unmask(dev);\n@@ -1577,16 +1577,16 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \tnfp_net_enbable_rxvlan_cap(hw, &rxvlan_ctrl);\n \n \t/* VLAN stripping setting */\n-\tif (mask & RTE_ETH_VLAN_STRIP_MASK) {\n-\t\tif (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n+\tif ((mask & RTE_ETH_VLAN_STRIP_MASK) != 0) {\n+\t\tif ((dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) != 0)\n \t\t\tnew_ctrl |= rxvlan_ctrl;\n \t\telse\n \t\t\tnew_ctrl &= ~rxvlan_ctrl;\n \t}\n \n \t/* QinQ stripping setting */\n-\tif (mask & RTE_ETH_QINQ_STRIP_MASK) {\n-\t\tif (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP)\n+\tif ((mask & RTE_ETH_QINQ_STRIP_MASK) != 0) {\n+\t\tif ((dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) != 0)\n \t\t\tnew_ctrl |= NFP_NET_CFG_CTRL_RXQINQ;\n \t\telse\n \t\t\tnew_ctrl &= ~NFP_NET_CFG_CTRL_RXQINQ;\n@@ -1674,7 +1674,7 @@ nfp_net_reta_update(struct rte_eth_dev *dev,\n \n \tupdate = NFP_NET_CFG_UPDATE_RSS;\n \n-\tif (nfp_net_reconfig(hw, hw->ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, hw->ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1748,28 +1748,28 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,\n \n \trss_hf = rss_conf->rss_hf;\n \n-\tif (rss_hf & RTE_ETH_RSS_IPV4)\n+\tif ((rss_hf & RTE_ETH_RSS_IPV4) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_TCP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_TCP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_TCP;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_UDP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_UDP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_UDP;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_SCTP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_SCTP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_SCTP;\n \n-\tif (rss_hf & RTE_ETH_RSS_IPV6)\n+\tif ((rss_hf & RTE_ETH_RSS_IPV6) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_TCP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_TCP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_TCP;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_UDP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_UDP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_UDP;\n \n-\tif (rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_SCTP)\n+\tif ((rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_SCTP) != 0)\n \t\tcfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_SCTP;\n \n \tcfg_rss_ctrl |= NFP_NET_CFG_RSS_MASK;\n@@ -1814,7 +1814,7 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,\n \n \tupdate = NFP_NET_CFG_UPDATE_RSS;\n \n-\tif (nfp_net_reconfig(hw, hw->ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, hw->ctrl, update) != 0)\n \t\treturn -EIO;\n \n \treturn 0;\n@@ -1838,28 +1838,28 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,\n \trss_hf = rss_conf->rss_hf;\n \tcfg_rss_ctrl = nn_cfg_readl(hw, NFP_NET_CFG_RSS_CTRL);\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4) != 0)\n \t\trss_hf |= RTE_ETH_RSS_IPV4;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_TCP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_TCP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_TCP;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_UDP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_UDP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_UDP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_UDP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6) != 0)\n \t\trss_hf |= RTE_ETH_RSS_IPV6;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_SCTP;\n \n-\tif (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_SCTP)\n+\tif ((cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6_SCTP) != 0)\n \t\trss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_SCTP;\n \n \t/* Propagate current RSS hash functions to caller */\ndiff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c\nindex ed9a946b0c..34764a8a32 100644\n--- a/drivers/net/nfp/nfp_cpp_bridge.c\n+++ b/drivers/net/nfp/nfp_cpp_bridge.c\n@@ -70,7 +70,7 @@ nfp_map_service(uint32_t service_id)\n \trte_service_runstate_set(service_id, 1);\n \trte_service_component_runstate_set(service_id, 1);\n \trte_service_lcore_start(slcore);\n-\tif (rte_service_may_be_active(slcore))\n+\tif (rte_service_may_be_active(slcore) != 0)\n \t\tPMD_INIT_LOG(INFO, \"The service %s is running\", service_name);\n \telse\n \t\tPMD_INIT_LOG(ERR, \"The service %s is not running\", service_name);\ndiff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c\nindex ebc5538291..12feec8eb4 100644\n--- a/drivers/net/nfp/nfp_ethdev.c\n+++ b/drivers/net/nfp/nfp_ethdev.c\n@@ -89,7 +89,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \t\t\t}\n \t\t}\n \t\tintr_vector = dev->data->nb_rx_queues;\n-\t\tif (rte_intr_efd_enable(intr_handle, intr_vector))\n+\t\tif (rte_intr_efd_enable(intr_handle, intr_vector) != 0)\n \t\t\treturn -1;\n \n \t\tnfp_configure_rx_interrupt(dev, intr_handle);\n@@ -113,7 +113,7 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n \n-\tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) {\n+\tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n \t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n@@ -125,15 +125,15 @@ nfp_net_start(struct rte_eth_dev *dev)\n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n \t/* Enable vxlan */\n-\tif (hw->cap & NFP_NET_CFG_CTRL_VXLAN) {\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_VXLAN) != 0) {\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_VXLAN;\n \t\tupdate |= NFP_NET_CFG_UPDATE_VXLAN;\n \t}\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n-\tif (nfp_net_reconfig(hw, new_ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn -EIO;\n \n \t/* Enable packet type offload by extend ctrl word1. */\n@@ -146,14 +146,14 @@ nfp_net_start(struct rte_eth_dev *dev)\n \t\t\t\t| NFP_NET_CFG_CTRL_IPSEC_LM_LOOKUP;\n \n \tupdate = NFP_NET_CFG_UPDATE_GEN;\n-\tif (nfp_net_ext_reconfig(hw, ctrl_extend, update) < 0)\n+\tif (nfp_net_ext_reconfig(hw, ctrl_extend, update) != 0)\n \t\treturn -EIO;\n \n \t/*\n \t * Allocating rte mbufs for configured rx queues.\n \t * This requires queues being enabled before\n \t */\n-\tif (nfp_net_rx_freelist_setup(dev) < 0) {\n+\tif (nfp_net_rx_freelist_setup(dev) != 0) {\n \t\tret = -ENOMEM;\n \t\tgoto error;\n \t}\n@@ -298,7 +298,7 @@ nfp_net_close(struct rte_eth_dev *dev)\n \n \tfor (i = 0; i < app_fw_nic->total_phyports; i++) {\n \t\t/* Check to see if ports are still in use */\n-\t\tif (app_fw_nic->ports[i])\n+\t\tif (app_fw_nic->ports[i] != NULL)\n \t\t\treturn 0;\n \t}\n \n@@ -598,7 +598,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \thw->mtu = RTE_ETHER_MTU;\n \n \t/* VLAN insertion is incompatible with LSOv2 */\n-\tif (hw->cap & NFP_NET_CFG_CTRL_LSO2)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n \t\thw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n \n \tnfp_net_log_device_information(hw);\n@@ -618,7 +618,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)\n \tnfp_net_write_mac(hw, &hw->mac_addr.addr_bytes[0]);\n \n \ttmp_ether_addr = &hw->mac_addr;\n-\tif (!rte_is_valid_assigned_ether_addr(tmp_ether_addr)) {\n+\tif (rte_is_valid_assigned_ether_addr(tmp_ether_addr) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %d\", port);\n \t\t/* Using random mac addresses for VFs */\n \t\trte_eth_random_addr(&hw->mac_addr.addr_bytes[0]);\n@@ -695,10 +695,11 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)\n \t/* Finally try the card type and media */\n \tsnprintf(fw_name, sizeof(fw_name), \"%s/%s\", DEFAULT_FW_PATH, card);\n \tPMD_DRV_LOG(DEBUG, \"Trying with fw file: %s\", fw_name);\n-\tif (rte_firmware_read(fw_name, &fw_buf, &fsize) < 0) {\n-\t\tPMD_DRV_LOG(INFO, \"Firmware file %s not found.\", fw_name);\n-\t\treturn -ENOENT;\n-\t}\n+\tif (rte_firmware_read(fw_name, &fw_buf, &fsize) == 0)\n+\t\tgoto load_fw;\n+\n+\tPMD_DRV_LOG(ERR, \"Can't find suitable firmware.\");\n+\treturn -ENOENT;\n \n load_fw:\n \tPMD_DRV_LOG(INFO, \"Firmware file found at %s with size: %zu\",\n@@ -727,7 +728,7 @@ nfp_fw_setup(struct rte_pci_device *dev,\n \tif (nfp_fw_model == NULL)\n \t\tnfp_fw_model = nfp_hwinfo_lookup(hwinfo, \"assembly.partno\");\n \n-\tif (nfp_fw_model) {\n+\tif (nfp_fw_model != NULL) {\n \t\tPMD_DRV_LOG(INFO, \"firmware model found: %s\", nfp_fw_model);\n \t} else {\n \t\tPMD_DRV_LOG(ERR, \"firmware model NOT found\");\n@@ -865,7 +866,7 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,\n \t\t * nfp_net_init\n \t\t */\n \t\tret = nfp_net_init(eth_dev);\n-\t\tif (ret) {\n+\t\tif (ret != 0) {\n \t\t\tret = -ENODEV;\n \t\t\tgoto port_cleanup;\n \t\t}\n@@ -878,7 +879,8 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev,\n \n port_cleanup:\n \tfor (i = 0; i < app_fw_nic->total_phyports; i++) {\n-\t\tif (app_fw_nic->ports[i] && app_fw_nic->ports[i]->eth_dev) {\n+\t\tif (app_fw_nic->ports[i] != NULL &&\n+\t\t\t\tapp_fw_nic->ports[i]->eth_dev != NULL) {\n \t\t\tstruct rte_eth_dev *tmp_dev;\n \t\t\ttmp_dev = app_fw_nic->ports[i]->eth_dev;\n \t\t\tnfp_ipsec_uninit(tmp_dev);\n@@ -950,7 +952,7 @@ nfp_pf_init(struct rte_pci_device *pci_dev)\n \t\tgoto hwinfo_cleanup;\n \t}\n \n-\tif (nfp_fw_setup(pci_dev, cpp, nfp_eth_table, hwinfo)) {\n+\tif (nfp_fw_setup(pci_dev, cpp, nfp_eth_table, hwinfo) != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Error when uploading firmware\");\n \t\tret = -EIO;\n \t\tgoto eth_table_cleanup;\ndiff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c\nindex 0c94fc51ad..c8d6b0461b 100644\n--- a/drivers/net/nfp/nfp_ethdev_vf.c\n+++ b/drivers/net/nfp/nfp_ethdev_vf.c\n@@ -66,7 +66,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \t\t\t}\n \t\t}\n \t\tintr_vector = dev->data->nb_rx_queues;\n-\t\tif (rte_intr_efd_enable(intr_handle, intr_vector))\n+\t\tif (rte_intr_efd_enable(intr_handle, intr_vector) != 0)\n \t\t\treturn -1;\n \n \t\tnfp_configure_rx_interrupt(dev, intr_handle);\n@@ -83,7 +83,7 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \tdev_conf = &dev->data->dev_conf;\n \trxmode = &dev_conf->rxmode;\n \n-\tif (rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) {\n+\tif ((rxmode->mq_mode & RTE_ETH_MQ_RX_RSS) != 0) {\n \t\tnfp_net_rss_config_default(dev);\n \t\tupdate |= NFP_NET_CFG_UPDATE_RSS;\n \t\tnew_ctrl |= nfp_net_cfg_ctrl_rss(hw->cap);\n@@ -94,18 +94,18 @@ nfp_netvf_start(struct rte_eth_dev *dev)\n \n \tupdate |= NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;\n \n-\tif (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_RINGCFG) != 0)\n \t\tnew_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;\n \n \tnn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl);\n-\tif (nfp_net_reconfig(hw, new_ctrl, update) < 0)\n+\tif (nfp_net_reconfig(hw, new_ctrl, update) != 0)\n \t\treturn -EIO;\n \n \t/*\n \t * Allocating rte mbufs for configured rx queues.\n \t * This requires queues being enabled before\n \t */\n-\tif (nfp_net_rx_freelist_setup(dev) < 0) {\n+\tif (nfp_net_rx_freelist_setup(dev) != 0) {\n \t\tret = -ENOMEM;\n \t\tgoto error;\n \t}\n@@ -330,7 +330,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \thw->mtu = RTE_ETHER_MTU;\n \n \t/* VLAN insertion is incompatible with LSOv2 */\n-\tif (hw->cap & NFP_NET_CFG_CTRL_LSO2)\n+\tif ((hw->cap & NFP_NET_CFG_CTRL_LSO2) != 0)\n \t\thw->cap &= ~NFP_NET_CFG_CTRL_TXVLAN;\n \n \tnfp_net_log_device_information(hw);\n@@ -350,7 +350,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)\n \tnfp_netvf_read_mac(hw);\n \n \ttmp_ether_addr = &hw->mac_addr;\n-\tif (!rte_is_valid_assigned_ether_addr(tmp_ether_addr)) {\n+\tif (rte_is_valid_assigned_ether_addr(tmp_ether_addr) == 0) {\n \t\tPMD_INIT_LOG(INFO, \"Using random mac address for port %d\",\n \t\t\t\t port);\n \t\t/* Using random mac addresses for VFs */\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 020e31e9de..3ea6813d9a 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -521,8 +521,8 @@ nfp_stats_id_free(struct nfp_flow_priv *priv, uint32_t ctx)\n \n \t/* Check if buffer is full */\n \tring = &priv->stats_ids.free_list;\n-\tif (!CIRC_SPACE(ring->head, ring->tail, priv->stats_ring_size *\n-\t\t\tNFP_FL_STATS_ELEM_RS - NFP_FL_STATS_ELEM_RS + 1))\n+\tif (CIRC_SPACE(ring->head, ring->tail, priv->stats_ring_size *\n+\t\t\tNFP_FL_STATS_ELEM_RS - NFP_FL_STATS_ELEM_RS + 1) == 0)\n \t\treturn -ENOBUFS;\n \n \tmemcpy(&ring->buf[ring->head], &ctx, NFP_FL_STATS_ELEM_RS);\n@@ -607,7 +607,7 @@ nfp_tun_add_ipv6_off(struct nfp_app_fw_flower *app_fw_flower,\n \n \trte_spinlock_lock(&priv->ipv6_off_lock);\n \tLIST_FOREACH(entry, &priv->ipv6_off_list, next) {\n-\t\tif (!memcmp(entry->ipv6_addr, ipv6, sizeof(entry->ipv6_addr))) {\n+\t\tif (memcmp(entry->ipv6_addr, ipv6, sizeof(entry->ipv6_addr)) == 0) {\n \t\t\tentry->ref_count++;\n \t\t\trte_spinlock_unlock(&priv->ipv6_off_lock);\n \t\t\treturn 0;\n@@ -641,7 +641,7 @@ nfp_tun_del_ipv6_off(struct nfp_app_fw_flower *app_fw_flower,\n \n \trte_spinlock_lock(&priv->ipv6_off_lock);\n \tLIST_FOREACH(entry, &priv->ipv6_off_list, next) {\n-\t\tif (!memcmp(entry->ipv6_addr, ipv6, sizeof(entry->ipv6_addr))) {\n+\t\tif (memcmp(entry->ipv6_addr, ipv6, sizeof(entry->ipv6_addr)) == 0) {\n \t\t\tentry->ref_count--;\n \t\t\tif (entry->ref_count == 0) {\n \t\t\t\tLIST_REMOVE(entry, next);\n@@ -671,14 +671,14 @@ nfp_tun_check_ip_off_del(struct nfp_flower_representor *repr,\n \tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0)\n \t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tif (ext_meta != NULL)\n \t\tkey_layer2 = rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2);\n \n-\tif (key_layer2 & NFP_FLOWER_LAYER2_TUN_IPV6) {\n-\t\tif (key_layer2 & NFP_FLOWER_LAYER2_GRE) {\n+\tif ((key_layer2 & NFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n+\t\tif ((key_layer2 & NFP_FLOWER_LAYER2_GRE) != 0) {\n \t\t\tgre6 = (struct nfp_flower_ipv6_gre_tun *)(nfp_flow->payload.mask_data -\n \t\t\t\t\tsizeof(struct nfp_flower_ipv6_gre_tun));\n \t\t\tret = nfp_tun_del_ipv6_off(repr->app_fw_flower, gre6->ipv6.ipv6_dst);\n@@ -688,7 +688,7 @@ nfp_tun_check_ip_off_del(struct nfp_flower_representor *repr,\n \t\t\tret = nfp_tun_del_ipv6_off(repr->app_fw_flower, udp6->ipv6.ipv6_dst);\n \t\t}\n \t} else {\n-\t\tif (key_layer2 & NFP_FLOWER_LAYER2_GRE) {\n+\t\tif ((key_layer2 & NFP_FLOWER_LAYER2_GRE) != 0) {\n \t\t\tgre4 = (struct nfp_flower_ipv4_gre_tun *)(nfp_flow->payload.mask_data -\n \t\t\t\t\tsizeof(struct nfp_flower_ipv4_gre_tun));\n \t\t\tret = nfp_tun_del_ipv4_off(repr->app_fw_flower, gre4->ipv4.dst);\n@@ -783,7 +783,7 @@ nfp_flow_compile_metadata(struct nfp_flow_priv *priv,\n \tmbuf_off_mask += sizeof(struct nfp_flower_meta_tci);\n \n \t/* Populate Extended Metadata if required */\n-\tif (key_layer->key_layer & NFP_FLOWER_LAYER_EXT_META) {\n+\tif ((key_layer->key_layer & NFP_FLOWER_LAYER_EXT_META) != 0) {\n \t\tnfp_flower_compile_ext_meta(mbuf_off_exact, key_layer);\n \t\tnfp_flower_compile_ext_meta(mbuf_off_mask, key_layer);\n \t\tmbuf_off_exact += sizeof(struct nfp_flower_ext_meta);\n@@ -1068,7 +1068,7 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_SET_TTL:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ACTION_TYPE_SET_TTL detected\");\n-\t\t\tif (key_ls->key_layer & NFP_FLOWER_LAYER_IPV4) {\n+\t\t\tif ((key_ls->key_layer & NFP_FLOWER_LAYER_IPV4) != 0) {\n \t\t\t\tif (!ttl_tos_flag) {\n \t\t\t\t\tkey_ls->act_size +=\n \t\t\t\t\t\tsizeof(struct nfp_fl_act_set_ip4_ttl_tos);\n@@ -1166,15 +1166,15 @@ nfp_flow_is_tunnel(struct rte_flow *nfp_flow)\n \tstruct nfp_flower_meta_tci *meta_tci;\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_VXLAN)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_VXLAN) != 0)\n \t\treturn true;\n \n-\tif (!(meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META))\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) == 0)\n \t\treturn false;\n \n \text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \tkey_layer2 = rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2);\n-\tif (key_layer2 & (NFP_FLOWER_LAYER2_GENEVE | NFP_FLOWER_LAYER2_GRE))\n+\tif ((key_layer2 & (NFP_FLOWER_LAYER2_GENEVE | NFP_FLOWER_LAYER2_GRE)) != 0)\n \t\treturn true;\n \n \treturn false;\n@@ -1270,7 +1270,7 @@ nfp_flow_merge_ipv4(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \tspec = item->spec;\n \tmask = item->mask ? item->mask : proc->mask_default;\n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0)\n \t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tif (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) {\n@@ -1281,8 +1281,8 @@ nfp_flow_merge_ipv4(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n \n-\t\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\t\tNFP_FLOWER_LAYER2_GRE)) {\n+\t\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\t\tNFP_FLOWER_LAYER2_GRE) != 0) {\n \t\t\tipv4_gre_tun = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n \n \t\t\tipv4_gre_tun->ip_ext.tos = hdr->type_of_service;\n@@ -1307,7 +1307,7 @@ nfp_flow_merge_ipv4(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t\t * reserve space for L4 info.\n \t\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4\n \t\t */\n-\t\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\t\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0)\n \t\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n \n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n@@ -1348,7 +1348,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \tspec = item->spec;\n \tmask = item->mask ? item->mask : proc->mask_default;\n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0)\n \t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tif (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) {\n@@ -1360,8 +1360,8 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n \n \t\tvtc_flow = rte_be_to_cpu_32(hdr->vtc_flow);\n-\t\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\t\tNFP_FLOWER_LAYER2_GRE)) {\n+\t\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\t\tNFP_FLOWER_LAYER2_GRE) != 0) {\n \t\t\tipv6_gre_tun = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n \n \t\t\tipv6_gre_tun->ip_ext.tos = vtc_flow >> RTE_IPV6_HDR_TC_SHIFT;\n@@ -1390,7 +1390,7 @@ nfp_flow_merge_ipv6(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t\t * reserve space for L4 info.\n \t\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv6\n \t\t */\n-\t\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\t\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0)\n \t\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n \n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n@@ -1434,7 +1434,7 @@ nfp_flow_merge_tcp(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) {\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0) {\n \t\tipv4 = (struct nfp_flower_ipv4 *)\n \t\t\t(*mbuf_off - sizeof(struct nfp_flower_ipv4));\n \t\tports = (struct nfp_flower_tp_ports *)\n@@ -1457,7 +1457,7 @@ nfp_flow_merge_tcp(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t\ttcp_flags = spec->hdr.tcp_flags;\n \t}\n \n-\tif (ipv4) {\n+\tif (ipv4 != NULL) {\n \t\tif (tcp_flags & RTE_TCP_FIN_FLAG)\n \t\t\tipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_FIN;\n \t\tif (tcp_flags & RTE_TCP_SYN_FLAG)\n@@ -1512,7 +1512,7 @@ nfp_flow_merge_udp(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) {\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0) {\n \t\tports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) -\n \t\t\tsizeof(struct nfp_flower_tp_ports);\n \t} else {/* IPv6 */\n@@ -1555,7 +1555,7 @@ nfp_flow_merge_sctp(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) {\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0) {\n \t\tports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) -\n \t\t\tsizeof(struct nfp_flower_tp_ports);\n \t} else { /* IPv6 */\n@@ -1595,7 +1595,7 @@ nfp_flow_merge_vxlan(struct nfp_app_fw_flower *app_fw_flower,\n \tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0)\n \t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tspec = item->spec;\n@@ -1607,8 +1607,8 @@ nfp_flow_merge_vxlan(struct nfp_app_fw_flower *app_fw_flower,\n \tmask = item->mask ? item->mask : proc->mask_default;\n \thdr = is_mask ? &mask->hdr : &spec->hdr;\n \n-\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)) {\n+\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n \t\ttun6 = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n \t\ttun6->tun_id = hdr->vx_vni;\n \t\tif (!is_mask)\n@@ -1621,8 +1621,8 @@ nfp_flow_merge_vxlan(struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n vxlan_end:\n-\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6))\n+\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0)\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv6_udp_tun);\n \telse\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n@@ -1649,7 +1649,7 @@ nfp_flow_merge_geneve(struct nfp_app_fw_flower *app_fw_flower,\n \tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0)\n \t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tspec = item->spec;\n@@ -1661,8 +1661,8 @@ nfp_flow_merge_geneve(struct nfp_app_fw_flower *app_fw_flower,\n \tmask = item->mask ? item->mask : proc->mask_default;\n \tgeneve = is_mask ? mask : spec;\n \n-\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)) {\n+\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n \t\ttun6 = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n \t\ttun6->tun_id = rte_cpu_to_be_32((geneve->vni[0] << 16) |\n \t\t\t\t(geneve->vni[1] << 8) | (geneve->vni[2]));\n@@ -1677,8 +1677,8 @@ nfp_flow_merge_geneve(struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n geneve_end:\n-\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)) {\n+\tif (ext_meta != NULL && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv6_udp_tun);\n \t} else {\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n@@ -1705,8 +1705,8 @@ nfp_flow_merge_gre(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n \text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \t/* NVGRE is the only supported GRE tunnel type */\n-\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) {\n+\tif ((rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n \t\ttun6 = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n \t\tif (is_mask)\n \t\t\ttun6->ethertype = rte_cpu_to_be_16(~0);\n@@ -1753,8 +1753,8 @@ nfp_flow_merge_gre_key(struct nfp_app_fw_flower *app_fw_flower,\n \tmask = item->mask ? item->mask : proc->mask_default;\n \ttun_key = is_mask ? *mask : *spec;\n \n-\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) {\n+\tif ((rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0) {\n \t\ttun6 = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n \t\ttun6->tun_key = tun_key;\n \t\ttun6->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY);\n@@ -1769,8 +1769,8 @@ nfp_flow_merge_gre_key(struct nfp_app_fw_flower *app_fw_flower,\n \t}\n \n gre_key_end:\n-\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n-\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)\n+\tif ((rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) != 0)\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv6_gre_tun);\n \telse\n \t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun);\n@@ -2115,7 +2115,7 @@ nfp_flow_compile_items(struct nfp_flower_representor *representor,\n \t\t\tsizeof(struct nfp_flower_in_port);\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) {\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META) != 0) {\n \t\tmbuf_off_exact += sizeof(struct nfp_flower_ext_meta);\n \t\tmbuf_off_mask += sizeof(struct nfp_flower_ext_meta);\n \t}\n@@ -2558,7 +2558,7 @@ nfp_flower_add_tun_neigh_v4_decap(struct nfp_app_fw_flower *app_fw_flower,\n \tport = (struct nfp_flower_in_port *)(meta_tci + 1);\n \teth = (struct nfp_flower_mac_mpls *)(port + 1);\n \n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0)\n \t\tipv4 = (struct nfp_flower_ipv4 *)((char *)eth +\n \t\t\t\tsizeof(struct nfp_flower_mac_mpls) +\n \t\t\t\tsizeof(struct nfp_flower_tp_ports));\n@@ -2685,7 +2685,7 @@ nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower,\n \tport = (struct nfp_flower_in_port *)(meta_tci + 1);\n \teth = (struct nfp_flower_mac_mpls *)(port + 1);\n \n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) != 0)\n \t\tipv6 = (struct nfp_flower_ipv6 *)((char *)eth +\n \t\t\t\tsizeof(struct nfp_flower_mac_mpls) +\n \t\t\t\tsizeof(struct nfp_flower_tp_ports));\n@@ -3181,7 +3181,7 @@ nfp_flow_action_tunnel_decap(struct nfp_flower_representor *repr,\n \t}\n \n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4)\n+\tif ((meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) != 0)\n \t\treturn nfp_flower_add_tun_neigh_v4_decap(app_fw_flower, nfp_flow_meta, nfp_flow);\n \telse\n \t\treturn nfp_flower_add_tun_neigh_v6_decap(app_fw_flower, nfp_flow_meta, nfp_flow);\ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex 66a5d6cb3a..4528417559 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -163,22 +163,22 @@ nfp_net_rx_cksum(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd,\n {\n \tstruct nfp_net_hw *hw = rxq->hw;\n \n-\tif (!(hw->ctrl & NFP_NET_CFG_CTRL_RXCSUM))\n+\tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXCSUM) == 0)\n \t\treturn;\n \n \t/* If IPv4 and IP checksum error, fail */\n-\tif (unlikely((rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM) &&\n-\t\t\t!(rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM_OK)))\n+\tif (unlikely((rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM) != 0 &&\n+\t\t\t(rxd->rxd.flags & PCIE_DESC_RX_IP4_CSUM_OK) == 0))\n \t\tmb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;\n \telse\n \t\tmb->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;\n \n \t/* If neither UDP nor TCP return */\n-\tif (!(rxd->rxd.flags & PCIE_DESC_RX_TCP_CSUM) &&\n-\t\t\t!(rxd->rxd.flags & PCIE_DESC_RX_UDP_CSUM))\n+\tif ((rxd->rxd.flags & PCIE_DESC_RX_TCP_CSUM) == 0 &&\n+\t\t\t(rxd->rxd.flags & PCIE_DESC_RX_UDP_CSUM) == 0)\n \t\treturn;\n \n-\tif (likely(rxd->rxd.flags & PCIE_DESC_RX_L4_CSUM_OK))\n+\tif (likely(rxd->rxd.flags & PCIE_DESC_RX_L4_CSUM_OK) != 0)\n \t\tmb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;\n \telse\n \t\tmb->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;\n@@ -232,7 +232,7 @@ nfp_net_rx_freelist_setup(struct rte_eth_dev *dev)\n \tint i;\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\tif (nfp_net_rx_fill_freelist(dev->data->rx_queues[i]) < 0)\n+\t\tif (nfp_net_rx_fill_freelist(dev->data->rx_queues[i]) != 0)\n \t\t\treturn -1;\n \t}\n \treturn 0;\n@@ -387,7 +387,7 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta,\n \t * to do anything.\n \t */\n \tif ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) {\n-\t\tif (meta->vlan_layer >= 1 && meta->vlan[0].offload != 0) {\n+\t\tif (meta->vlan_layer > 0 && meta->vlan[0].offload != 0) {\n \t\t\tmb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci);\n \t\t\tmb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;\n \t\t}\n@@ -771,7 +771,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\t/* Filling the received mbuf with packet info */\n-\t\tif (hw->rx_offset)\n+\t\tif (hw->rx_offset != 0)\n \t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM + hw->rx_offset;\n \t\telse\n \t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM +\n@@ -846,7 +846,7 @@ nfp_net_rx_queue_release_mbufs(struct nfp_net_rxq *rxq)\n \t\treturn;\n \n \tfor (i = 0; i < rxq->rx_count; i++) {\n-\t\tif (rxq->rxbufs[i].mbuf) {\n+\t\tif (rxq->rxbufs[i].mbuf != NULL) {\n \t\t\trte_pktmbuf_free_seg(rxq->rxbufs[i].mbuf);\n \t\t\trxq->rxbufs[i].mbuf = NULL;\n \t\t}\n@@ -858,7 +858,7 @@ nfp_net_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)\n {\n \tstruct nfp_net_rxq *rxq = dev->data->rx_queues[queue_idx];\n \n-\tif (rxq) {\n+\tif (rxq != NULL) {\n \t\tnfp_net_rx_queue_release_mbufs(rxq);\n \t\trte_eth_dma_zone_free(dev, \"rx_ring\", queue_idx);\n \t\trte_free(rxq->rxbufs);\n@@ -906,7 +906,7 @@ nfp_net_rx_queue_setup(struct rte_eth_dev *dev,\n \t * Free memory prior to re-allocation if needed. This is the case after\n \t * calling nfp_net_stop\n \t */\n-\tif (dev->data->rx_queues[queue_idx]) {\n+\tif (dev->data->rx_queues[queue_idx] != NULL) {\n \t\tnfp_net_rx_queue_release(dev, queue_idx);\n \t\tdev->data->rx_queues[queue_idx] = NULL;\n \t}\n@@ -1037,7 +1037,7 @@ nfp_net_tx_queue_release_mbufs(struct nfp_net_txq *txq)\n \t\treturn;\n \n \tfor (i = 0; i < txq->tx_count; i++) {\n-\t\tif (txq->txbufs[i].mbuf) {\n+\t\tif (txq->txbufs[i].mbuf != NULL) {\n \t\t\trte_pktmbuf_free_seg(txq->txbufs[i].mbuf);\n \t\t\ttxq->txbufs[i].mbuf = NULL;\n \t\t}\n@@ -1049,7 +1049,7 @@ nfp_net_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx)\n {\n \tstruct nfp_net_txq *txq = dev->data->tx_queues[queue_idx];\n \n-\tif (txq) {\n+\tif (txq != NULL) {\n \t\tnfp_net_tx_queue_release_mbufs(txq);\n \t\trte_eth_dma_zone_free(dev, \"tx_ring\", queue_idx);\n \t\trte_free(txq->txbufs);\n", "prefixes": [ "v2", "01/11" ] }