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 44A4945DB9 for ; Wed, 27 Nov 2024 18:23:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4099A40A70; Wed, 27 Nov 2024 18:23:08 +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 8059E402DE for ; Wed, 27 Nov 2024 18:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728186; 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=lNzYcv96Xz5seXkwPWdIJnzJEmAVK2S+jnguSOfjaEw=; b=c/SEy6xczU6EuR+3+aQ2wID/btnrtdCHBmsfrK/pTeOsViRJGTJt8HCuGTRxFcJIVtv1oB vzTauEonn/uzEkWIu+EDyT2uWRNYJFRYF8Mvv0ffLIxT68KrdzL/Npet1V2hN+DhHg6mfy RrQCbmqNkO93xjQitfZ+xns40DhLnPI= Received: from mx-prod-mc-03.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-401-VKVO_O32Pv6enOZQe61pPA-1; Wed, 27 Nov 2024 12:23:02 -0500 X-MC-Unique: VKVO_O32Pv6enOZQe61pPA-1 X-Mimecast-MFC-AGG-ID: VKVO_O32Pv6enOZQe61pPA 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E2CC819560BE; Wed, 27 Nov 2024 17:23:01 +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 D80AE300019E; Wed, 27 Nov 2024 17:23:00 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: remove dead conditional' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:48 +0000 Message-ID: <20241127171916.690404-101-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: xxd9AUZcRnUHZsFKtHVWGIp99-SA9L2ScVnGr_fL4eM_1732728182 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/e8c123ffdb05d5da33461db7959c6070e3ca3a89 Thanks. Kevin --- >From e8c123ffdb05d5da33461db7959c6070e3ca3a89 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 [ 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 @@ -76,8 +76,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) if (!sc->stats_pending) { - if (sc->stats_pending) { - return; - } - sc->fw_stats_req->hdr.drv_stats_counter = htole16(sc->stats_counter++); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.433440660 +0000 +++ 0101-net-bnx2x-remove-dead-conditional.patch 2024-11-27 17:17:38.313269829 +0000 @@ -1 +1 @@ -From 3868c0ce5ce83eacc9611cc4a83d20120ae3442e Mon Sep 17 00:00:00 2001 +From e8c123ffdb05d5da33461db7959c6070e3ca3a89 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3868c0ce5ce83eacc9611cc4a83d20120ae3442e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,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 +20 @@ -index d473c5e7ec..8adbe7e381 100644 +index 69132c7c80..72a26ed5cc 100644 @@ -22 +23 @@ -@@ -74,7 +74,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) +@@ -76,8 +76,4 @@ bnx2x_storm_stats_post(struct bnx2x_softc *sc) @@ -25 +26 @@ -- if (sc->stats_pending) +- if (sc->stats_pending) { @@ -26,0 +28 @@ +- }