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 A0AC945DB9 for ; Wed, 27 Nov 2024 18:23:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C940402DE; Wed, 27 Nov 2024 18:23:11 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id CE91A40A70 for ; Wed, 27 Nov 2024 18:23:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tTi420NLOn9dnV8Y5rluK+GKZsmR0/YDHCy8t6ds+BI=; b=anziG/pb3eB2H0IrTHThjFKYoxqiOFK5uOiWFR/ISTm8OJZ7l8zWM4wiNRIBp9TKtBbuBZ a6F24rnnCKwV5cYQQAVqeP7qjDppwZqAHi4Vx7mol/9D9FR6/LT0O/K9C6c11dTctrW884 ID85BAhX/57esmeaoEy3WQaKyD65GY0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-MJCzBXohMGGIkVYH8pznKg-1; Wed, 27 Nov 2024 12:23:07 -0500 X-MC-Unique: MJCzBXohMGGIkVYH8pznKg-1 X-Mimecast-MFC-AGG-ID: MJCzBXohMGGIkVYH8pznKg Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D069E1955EE9; Wed, 27 Nov 2024 17:23:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C928B300019E; Wed, 27 Nov 2024 17:23:05 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: fix duplicate branch' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:51 +0000 Message-ID: <20241127171916.690404-104-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: StWnZJFZHhrQ-9Br8Q3fw3Dhd_iD0vk-xv-H5kHhI7o_1732728186 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 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/02/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e197a12ccd8fdfc5dcfbb0214ed746f441418dc9 Thanks. Kevin --- >From e197a12ccd8fdfc5dcfbb0214ed746f441418dc9 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 @@ -1624,14 +1624,10 @@ 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 */ -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.539183590 +0000 +++ 0104-net-bnx2x-fix-duplicate-branch.patch 2024-11-27 17:17:38.328269907 +0000 @@ -1 +1 @@ -From 87e210eb086f49f32733c579003b9565e46535d7 Mon Sep 17 00:00:00 2001 +From e197a12ccd8fdfc5dcfbb0214ed746f441418dc9 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