From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3979945E41 for ; Sat, 7 Dec 2024 09:06:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 315AC40281; Sat, 7 Dec 2024 09:06:55 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2068.outbound.protection.outlook.com [40.107.237.68]) by mails.dpdk.org (Postfix) with ESMTP id 4D5B640281 for ; Sat, 7 Dec 2024 09:06:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=STxlukdK47tE/RlS2NSnTUUYN/l9DV+2KPbMMLd9MLFwIeeSfkgQnpbn7G+4DH/6//Ok1QyUJbsV6SOCX7d6TKAEZdWBWnbRzByLMnQmE2XkWI0nziX7U+2w8rwmnZ8wNzbJjWHFMyWuR8ubi1sHjLF0YuGTw0ezBd6ERtRPRIOGe6v6ssxmrS1tG2B2cX42JXiJIImzV1HKNbxkCbZkjVY5+wonYl1Gpc5DjhajSGwjaHRKg6wg3Zywyzi/fMlI27wfRJ6JBoSH7EebJ7z/Wcyjk5NUyY0CDU2RQwN2grq5V7GtA7l2TqsUHudlPlFQxPr5LEBInwa0fRQQsw0g2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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; bh=NcFRvinVecFCo8mRg/Txl4t5HnBdO7Odr9b2qrDkMfQ=; b=UmrZa9k/XK1fcbjU7bmvjih8orpqnBNYzJJ3QUV2wEN0JXdZl3r77+a3Mb/GXOinMZSKn+fjgKlxqWX6Ez2iOxMb+DOeb8RCKUuSGXlxaUfT8TmEMQJkk+8tCjqYqtWAepFCp/axLWsGaMhLyw7v3qIZLGWuZip9tSOxRLB8BXFsMI38vSS5l7VciyoNQsTPtn+3hvDI6+QduKiM5lXVnDRKKX1wcld7KC5e5mEfmvW3VraNMtXFlivDzND0LxzSVcD4/Q80ySVrlXUtDgo2pIuPSgBJVhW7vWu4FBvjPC7FxoTtDp0qrzhXsyQp9q8UhSbVGghhaKbjc7nbXHqW3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NcFRvinVecFCo8mRg/Txl4t5HnBdO7Odr9b2qrDkMfQ=; b=hPWV69T4X0iIDNA2iDYdQUUcLMiaGelAZsQD3o/2qMxZ3yAL+l975EH/H/mruZmeA7mh1BmOZF+e3ge9gggquufR/k7Z+82bStIMFaFL9CXfOCz3U0xSQx2lghUxlrijg9gjoyJ062cBtt8BJdG+dl3A4xKrQpYZFnQAsFOujVyS/LQR7vPoffb4/IF4qJUVqQekV8zPqVSyyP9/4IsC81J88MbCuKdGDuEdZXUAhL0hTc74oAY/DKuvaffDqZ3+nzS8Z2RlZAprTMERmv83tBYINsMM//8Yu4h23oJDX+t42hZFGQgM9WNAowARli4Tveczbj6juvYqM9yC2qe1iA== Received: from BN9PR03CA0146.namprd03.prod.outlook.com (2603:10b6:408:fe::31) by DM4PR12MB7550.namprd12.prod.outlook.com (2603:10b6:8:10e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Sat, 7 Dec 2024 08:06:48 +0000 Received: from BL02EPF00021F69.namprd02.prod.outlook.com (2603:10b6:408:fe:cafe::dd) by BN9PR03CA0146.outlook.office365.com (2603:10b6:408:fe::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8207.19 via Frontend Transport; Sat, 7 Dec 2024 08:06:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00021F69.mail.protection.outlook.com (10.167.249.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:06:48 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:06:35 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:06:34 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'net/bnx2x: remove dead conditional' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:16 +0800 Message-ID: <20241207080055.488538-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00021F69:EE_|DM4PR12MB7550:EE_ X-MS-Office365-Filtering-Correlation-Id: f6b8a6be-640b-40cf-7353-08dd16961952 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tYeGoRl0JwrQ7BFdy3lG7297i9pq8mvNfwicG8++s2X/fl5ONxqCHoljgV+j?= =?us-ascii?Q?hgejLCbXWCJ2na6yfP0dS8TVKOwKg3x3XB19eHLB1rGeF76W8DRScTUhyBDC?= =?us-ascii?Q?IpasOgE5wosFc5ivZDEe0z9ldQ+TlffyAv5Q5EHw6WvduZv3iyAODdrjjZOj?= =?us-ascii?Q?hTzlr8MZOe22ptMFHz93x/CiiJMQhEDm0hipgd+7EPeCUPhUnGy1cA//80HT?= =?us-ascii?Q?ZdPWkoadHnWbOVSQpYYRkpU9x7OoVPLMmO+GBOk22EfIPNS7sz8IVsmb90jG?= =?us-ascii?Q?DtLVNz/nGm/qNGDA46KwjmUEFOGt4fJZdCFqd+NSTF4c5sMdD/OONr3cKj1f?= =?us-ascii?Q?e9bzajtdvTjf9V4nCDfeNHtWPBuDd80+d2zKygm3eLa9wjxVi+x2Ce6z1vjh?= =?us-ascii?Q?slvpVqLp79DE7Day1hksUx9nu9jcBj7vkLH8p+1GYwrbM0/32Cb5zWE+ZCgC?= =?us-ascii?Q?NyWeuq0QNxRUIayHYWlWWsFSZTvaU2T1l2uO6GpXn/Fuwa6aGDqAEXwgKFFE?= =?us-ascii?Q?1MfQDPcQDDpl5zR6Ez82+9T1y6WCAND/WZcM1urwznrygsK5uiXPxSRy3O6P?= =?us-ascii?Q?8ZH7DD1WAZg+NDLiwfNDQe3aHMNGP+aRpsO302i9joEeN866WvZnyR7Ce7D0?= =?us-ascii?Q?5hkfaqU/2BEqTYTWphoXzjU5KV3yBxiC+Cn4esSo/siGZ2AonT4pkDf40Iio?= =?us-ascii?Q?UGzC8QHwh2McwdltAQElOoPImc9Km0BJ9amGnuzNf47uwHeurRuJ8hrkALe1?= =?us-ascii?Q?9oy6WksMvzE4Xub8qLk1mTnaGrs+2bQMxD8k/bBZifsOxA+bIskJWm2xs/Gc?= =?us-ascii?Q?OHi/1XVrMy2mAfd++kFB0+kAkOd8CW+8CT6dv70OQ3gnGFPz3+krkPQgPsft?= =?us-ascii?Q?ky+j5gOdVCxD570VZx1JexjmJMpwUD4jU64DANdD6RGJxVT5On3do/nDCVE8?= =?us-ascii?Q?VGBmJ7M2VZ1zppvh6B9OD0UcyZJJegwOtHivSTyQq+mYbqZVey0G6TwN62s4?= =?us-ascii?Q?PQ17WVDto9K+ACpeZKUkior5UfmeRdot2nRBujgbx941j8s98CyY7VkWkXJH?= =?us-ascii?Q?o856VE0N2csJZk6k7JNs75V6leBqkhFlM9ppNqnkU6Y/hDjnw8bae7vI2qTM?= =?us-ascii?Q?cXPwnjsIrnKipOKlkxyRzgCJgiCZ0YBZvNH5p8uiv2rn78qjEDBt+HmdXKgk?= =?us-ascii?Q?YagCAMeZlYsBYeQ1PdMEtVqIm246N5I2CLo/z5xm4lXL5Sk6Yq5o+XZQi8SE?= =?us-ascii?Q?fw2aVRHxEw5Mh51fORxik/Y0/eH0RaWXBp0iGjAXCE8U3Ju2B1ALdG4e1X4F?= =?us-ascii?Q?o0o1jkprXVx+YLdnwkaXIycltoEGKDj1WDZljIOBy2YA95IQQ2VPqtd42gQp?= =?us-ascii?Q?GWHOFgZHXC90dxZ46V1uzcmFc9As5eugN45HXPc/aaVmAWwnSNDxNfmDT5nv?= =?us-ascii?Q?voHC4QH7OKWWZGB2ZODf2lRmVwSy7GLG?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:06:48.0342 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6b8a6be-640b-40cf-7353-08dd16961952 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F69.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7550 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=9643a94a10f8243dc268b83311648e52b92c8900 Thanks. Xueming Li --- >From 9643a94a10f8243dc268b83311648e52b92c8900 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 Nov 2024 09:43:53 -0800 Subject: [PATCH] net/bnx2x: remove dead conditional Cc: Xueming Li [ upstream commit 3868c0ce5ce83eacc9611cc4a83d20120ae3442e ] The second if test here is impossible because it contradicts previous line. Coverity issue: 384428 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Stephen Hemminger --- drivers/net/bnx2x/bnx2x_stats.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c index 69132c7c80..72a26ed5cc 100644 --- a/drivers/net/bnx2x/bnx2x_stats.c +++ b/drivers/net/bnx2x/bnx2x_stats.c @@ -75,10 +75,6 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) int rc; if (!sc->stats_pending) { - if (sc->stats_pending) { - return; - } - sc->fw_stats_req->hdr.drv_stats_counter = htole16(sc->stats_counter++); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.001370505 +0800 +++ 0058-net-bnx2x-remove-dead-conditional.patch 2024-12-06 23:26:43.973044828 +0800 @@ -1 +1 @@ -From 3868c0ce5ce83eacc9611cc4a83d20120ae3442e Mon Sep 17 00:00:00 2001 +From 9643a94a10f8243dc268b83311648e52b92c8900 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3868c0ce5ce83eacc9611cc4a83d20120ae3442e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -15,2 +17,2 @@ - drivers/net/bnx2x/bnx2x_stats.c | 3 --- - 1 file changed, 3 deletions(-) + drivers/net/bnx2x/bnx2x_stats.c | 4 ---- + 1 file changed, 4 deletions(-) @@ -19 +21 @@ -index d473c5e7ec..8adbe7e381 100644 +index 69132c7c80..72a26ed5cc 100644 @@ -22 +24 @@ -@@ -73,9 +73,6 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) +@@ -75,10 +75,6 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) @@ -26 +28 @@ -- if (sc->stats_pending) +- if (sc->stats_pending) { @@ -27,0 +30 @@ +- }