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 EFC8B45D5D for ; Thu, 21 Nov 2024 00:42:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E621C43283; Thu, 21 Nov 2024 00:42:50 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 36EC640296 for ; Thu, 21 Nov 2024 00:42:49 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43161c0068bso2265525e9.1 for ; Wed, 20 Nov 2024 15:42:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732146169; x=1732750969; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8G/stKRAONlLotqTp2vV2AnLBOdzfAZlUU7DdtX2wUE=; b=YM2hMqHAgovxmyuJIg1oyXC+BlAxOIFbJdz+3lkDb2OOqnaPM1phHANiNf2vvOyE2w u6SzgoQvwktyMja2sXbVAqWbMsB9ZfAl+7oUQDAt9RTW5fmcTS8S3H2dIjX8CAkMUBPI 6MyV7gDMxhg5fuEjK4InbjRqpqqk3ZnMjEeKrVgyRfXZc/bH70VHTrnIgJB+j+QwY5sw EO1+n1uUcdk6oEVmoiksS/qtQgoKj6miOgCiq+oJU117uvWAQrT0ultgD9aYqjQbIj4Q Y6M6D9Azhq2HYiQwzNRVccs9VJS96kvgOGFvgmiVUSUjOoapdiGwVSNON3yD0r0EVcum r0BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732146169; x=1732750969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8G/stKRAONlLotqTp2vV2AnLBOdzfAZlUU7DdtX2wUE=; b=htOCWW5J/OncoeP2YXTIrbVoEp91KIcs6rSnKvD5GADnoUEhSfgmb/DdDPZnlec6BG XouAoeElxMSBm3uaTVGzo+g+aNvG0QuWIyTxB5zsnYPuEd9DsNJjhVK4wdTEU+KjUPeX Z6zAqUgmDfZAFcbF+i7m6T8dfBVYeeFJlChNahEIgKoeJBBeTvaRimEN/WosYoG8JkXI 9b8UT+0m6n2EogzT9NXhKQ4yPCdMJRPX/CH4dyox3Dwm0wrOhmwxXO/Ycu0L1yVyO9sK bFGymzqI3Ip98EbKvtzf2PUXjSXyH97uLOYvA1ioDV/MFrOQ1czig0x/wc2ZWrK6E2Fx tH5w== X-Gm-Message-State: AOJu0YwKh+jQptF58OHawyukKtyOqBaXzisf0QE9LvgmQoEwxDHoBF15 mdKHRWpFswE3H/I1/Y5xILSqr1qQiYwaxAG1ozBSGwwC0/we1Dgr0v+D3jvs X-Google-Smtp-Source: AGHT+IGXU9AYJtGcUg3UyLhZoH0k7xpjQzK42jYxVNCKzbjVYspg1fd49qp7hzla/iomfwsHiuyH/g== X-Received: by 2002:a7b:cde1:0:b0:431:5ba1:a513 with SMTP id 5b1f17b1804b1-433c546c747mr18068145e9.10.1732146168654; Wed, 20 Nov 2024 15:42:48 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433b45d17d8sm35560805e9.7.2024.11.20.15.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 15:42:47 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: fix duplicate branch' has been queued to stable release 22.11.7 Date: Wed, 20 Nov 2024 23:41:34 +0000 Message-ID: <20241120234215.233355-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241120234215.233355-1-luca.boccassi@gmail.com> References: <20241112220754.666489-40-luca.boccassi@gmail.com> <20241120234215.233355-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/22/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e7686974859ea99169da0175fce846e77405c596 Thanks. Luca Boccassi --- >From e7686974859ea99169da0175fce846e77405c596 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 [ 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 a93642650a..7493563911 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-20 23:41:23.049020593 +0000 +++ 0009-net-bnx2x-fix-duplicate-branch.patch 2024-11-20 23:41:22.704195467 +0000 @@ -1 +1 @@ -From 87e210eb086f49f32733c579003b9565e46535d7 Mon Sep 17 00:00:00 2001 +From e7686974859ea99169da0175fce846e77405c596 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87e210eb086f49f32733c579003b9565e46535d7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d96fcb55c9..51e5cabf7b 100644 +index a93642650a..7493563911 100644