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 E1CAE45E41 for ; Sat, 7 Dec 2024 09:07:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8ED740E4D; Sat, 7 Dec 2024 09:07:17 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2059.outbound.protection.outlook.com [40.107.100.59]) by mails.dpdk.org (Postfix) with ESMTP id 8DEE540281 for ; Sat, 7 Dec 2024 09:07:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y1RcOe+3d8BybZrxKajfgs8VDs5bzFEiWkqv/rzBlb7nwWIThp9FdrtOEpCG3eR+Vs0gs6peKJ1B1ta83rkPC7h6Q6HgICKRtkj9mGC9iNzykVXvn6BgK0IFQNgcR5UF009pvgM/t7kq/PWLw2IPeyzkMcGznuLVGiOYSSAOunLWGVIXL/tZmac1I5Wp2ggiy57fcVZXBgWrUWjQ2wzDX7Og7XSxNPxFXP/jISAMUWjILjBQtMMl/7UvQqB/7DbpwrKBVYk3mV2HgJwSSFLWXEYOduD5GwqUzP/9pFNOeTW9EH/J6krgBVfXYnRo6cqD+c48+Pp1CDgp7O697WU+hQ== 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=u31p6qX++YbZIiBcd8RtXkTmW68iu0fa+JyC3OYDyDc=; b=hCUce2qvjwzt4Wvm/iu+MXktsGL1PpDwzJAc6ivA2pd/Q6/3j4S9Zb6v7sAbBVBdDG258p/uEFC59CKexFO2rzVX+GKpl88tWryno/3OOAzYCPIMAMuAhJpCILprc5pxXguo63UEKxrSJQ9G8C1W/Z2GBBwPHrsccNEvzOTOaOYybp+2upNMYOvPqGxiNiym6i7Kq/WP11oACAgFRj7wYb7x/zj1M9RT6eq0GafKTkWMttfSN1EOMzjDRGluq+7WMA1XToxQX3vo3ezcwfe1raMXEztylluivIiFMpRGch9wn24KlSmVMbubZX7puN3BUY4ijQFhjHKK/qfDdaCgQg== 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=u31p6qX++YbZIiBcd8RtXkTmW68iu0fa+JyC3OYDyDc=; b=eh+q0C3Xnyn300b94i3Nx7lfHxHAlG64D/SD+3BQtUID5vr65yNPqeLybXjG8NYjpBlpWi4YDDy8gFEodkrkZgNUxblqPSTchNbiRORSVZbxPabyYxltWtHY6Khys/4OU1y0ixIDu2dqPxsjLApmKIscpSymt5L7ql1EEcDEGP0rcs4HFz0Q0lkdF9PL9WLPzvIpLBbsPzPZ9uM0Mh63lVKovBBxDykX3qkg1J+6TB2czYP57cclTmNzFTiZ9Omp2n9m4VOTi01z1mf45YgxuG0YhkYaLa8Tqcgh5JbJqp+YcOW0VH7eC8HGkCQCT2kUJv9NDlqp+2GeIzqGG0u63w== Received: from BLAPR03CA0012.namprd03.prod.outlook.com (2603:10b6:208:32b::17) by SA3PR12MB7860.namprd12.prod.outlook.com (2603:10b6:806:307::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.11; Sat, 7 Dec 2024 08:07:13 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:208:32b:cafe::15) by BLAPR03CA0012.outlook.office365.com (2603:10b6:208:32b::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.10 via Frontend Transport; Sat, 7 Dec 2024 08:07:12 +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 BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) 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:07:12 +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:58 -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:57 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'net/bnx2x: fix duplicate branch' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:19 +0800 Message-ID: <20241207080055.488538-62-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: BL02EPF00021F68:EE_|SA3PR12MB7860:EE_ X-MS-Office365-Filtering-Correlation-Id: 09b26a13-3431-46c0-6bf8-08dd169627cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QY7dkOy46ptMA+pHWCjNzqCff+MCmtJkqrl6rfO+k49D7Q9Ngs+YZENpum7R?= =?us-ascii?Q?B3N1c9fZnEQWx3FmAA77SKtjjWs2HZZ89J8DVfDB6NuCxthw3GiclOvDORtP?= =?us-ascii?Q?7miQOEmtFsqwZLSEx/h3BAU3ASN0Fhy0fez4HMgp4px0vgPQPPHWlUvoyRT1?= =?us-ascii?Q?O4/flEPmXwFS4hQVLUTfhIcdffy7jnlKd1ZyUO3VnjUt8K8ttie7vZKM1gHM?= =?us-ascii?Q?D4x8dujj1R5BjQeFTfYUayRtF3rl+cgEvpu+tsXKr7hE5+Of6uFFux34PT7y?= =?us-ascii?Q?TPGLgSvt87oVN1E4S9Hm7wZqab1PL+uVTyPctNXwd4+bMGdSrQMM//yb4Qdi?= =?us-ascii?Q?CcNxqz35PUaGpwSKrQdjmGzWD6YN2oX7uX6zUgo4XPoavQhIVweu4GLyJhYe?= =?us-ascii?Q?UCR8xzasYNBhFuVwrVogV0GGn58CuiMT7hSPGq050EHuXPePI/jbMqz4o6QK?= =?us-ascii?Q?al3ipwtFaKjwdv7oEZTfqnSlZB0NVmrk5kodkGvRTau5KlRoWod7H3HEKdH7?= =?us-ascii?Q?zGCZgsipgT+kScTGWWg1kkYZdrCqMjXKHZitGcUDlkMjGnY1yX/DH6GMiI56?= =?us-ascii?Q?k16OJlSrtyOrcsTftTcfDaNJy6ZvfjZqro5bRK3XZm8aiNVhKgxR6ciFY3e2?= =?us-ascii?Q?FW5P8/SnHPY/C3CbU6ah7IsY8Ybx4to3APsEimqfOxscT6G9QRQH6AUhSXi4?= =?us-ascii?Q?Y3crbH5xbe2felxotRz154KHMs2t0tAj2vODTLKutzBiWQMB5Z8I1Y72zazJ?= =?us-ascii?Q?y4FJ6qO9N08b/PxlPBCJnSpT4/Uilab4f4IEPJSLRxvU4MZoaSe3dFVqKY4K?= =?us-ascii?Q?ZsHnNV/NdZqONI1Ic33ssmBuNA19/guq4swc0QKXod/eTTZhE1y0pok1Hv2I?= =?us-ascii?Q?sxi/ITBk9K1AyyUcwQy+FpRje5YyCcubeBE6Gzhzr+3y4CbmOuYaFvN3wNtV?= =?us-ascii?Q?s9ZQr/hlrCT1DaZzIQR689v7SxeGCFxsg39R7HecHonIA/w0wWc8luYHteVu?= =?us-ascii?Q?tbM/WljKV2ct4EKAFpuBkG04k3QrpZJpCMh6R6dSSpfZj5nlgPax6+STlcyc?= =?us-ascii?Q?rZBLkP8VJjMoQZKnHJS5FVw6zcsJLZ0+5lOzfeHLzAQzwckjzNHMjDapCbKK?= =?us-ascii?Q?vUEgBsMLyi6RHJVeJmPj1of7PLYoJb9ek04l084u78AysVdG573T8PyTRbWT?= =?us-ascii?Q?sphJ8ll+jwXD73pRoSU5lcPGdiGy5quWFDVleTpMJvDIZfOW1ik/Cyvq4kH5?= =?us-ascii?Q?OuJ9uxwgfUpq6AIMfd3VTc6cBqpuLl0iMNMLXWb5b7aHSSLOQo/O63zJWvIC?= =?us-ascii?Q?QCB4XhFol5KsrDpfIk3YK84wNIpnq6g0eWJrqkaq7GFg+yfHtyLhzo5Ukn42?= =?us-ascii?Q?QqoCsvDezM1ssmib5CSuotGojN4xVPbJiHCkFDSU/rm0YowuGP187Z2tlWLG?= =?us-ascii?Q?9f5v0xkab0R7ItJVTw1ZHW1ecK2FlwDu?= 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)(1800799024)(36860700013)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:07:12.3061 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09b26a13-3431-46c0-6bf8-08dd169627cc 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: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7860 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=17adb7d627eb5096c5396625cfe6ba258f747893 Thanks. Xueming Li --- >From 17adb7d627eb5096c5396625cfe6ba258f747893 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 Nov 2024 09:43:56 -0800 Subject: [PATCH] net/bnx2x: fix duplicate branch Cc: Xueming Li [ upstream commit 87e210eb086f49f32733c579003b9565e46535d7 ] Coverity spotted that both legs of the conditional are the same. Looking at kernel driver there is additional code there, but the kernel driver supports Wake On Lan, and DPDK does not. Coverity issue: 362072 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Stephen Hemminger --- drivers/net/bnx2x/bnx2x.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index d96fcb55c9..51e5cabf7b 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -1623,16 +1623,12 @@ static int bnx2x_nic_unload_no_mcp(struct bnx2x_softc *sc) } /* request unload mode from the MCP: COMMON, PORT or FUNCTION */ -static uint32_t bnx2x_send_unload_req(struct bnx2x_softc *sc, int unload_mode) +static uint32_t bnx2x_send_unload_req(struct bnx2x_softc *sc, int unload_mode __rte_unused) { uint32_t reset_code = 0; /* Select the UNLOAD request mode */ - if (unload_mode == UNLOAD_NORMAL) { - reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; - } else { - reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; - } + reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; /* Send the request to the MCP */ if (!BNX2X_NOMCP(sc)) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.097480404 +0800 +++ 0061-net-bnx2x-fix-duplicate-branch.patch 2024-12-06 23:26:43.983044827 +0800 @@ -1 +1 @@ -From 87e210eb086f49f32733c579003b9565e46535d7 Mon Sep 17 00:00:00 2001 +From 17adb7d627eb5096c5396625cfe6ba258f747893 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 87e210eb086f49f32733c579003b9565e46535d7 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org