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 95E3645D5D for ; Thu, 21 Nov 2024 00:42:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78B8640296; Thu, 21 Nov 2024 00:42:43 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id BB01340296 for ; Thu, 21 Nov 2024 00:42:41 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so2153085e9.0 for ; Wed, 20 Nov 2024 15:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732146161; x=1732750961; 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=1XxtWDrswZS9YG0rGeDJ9eQZkZ7ZWzi9jwU23ZVveUc=; b=Hc5cZbiAkqBvQRuuGuPwnWINZkPr1TgpccIF/OJ4hJ4eRhEfRFzC+snvW0XT0ePlZJ l3101l2byVHp2/jkEtxgS3Wnob1mwf8GOKfmAJGHRthwoo8Z/gUTcF8E3mJEg9dS1cPf OXCJuref5Amw6zTEQBFtYKLBX6bsIeXxgv0eg2sKni127VTezMYr9cm9ZJVunqqgqpOr iXyHsvn7FZR8n5Mdho7L7EDFUSmkgiHjvF/jj4XoSMOYSgxSm8haiynEASkyr34rb8x5 DfD3Fa6XcTIJgyMPPIRDtzTlYNBLuD98rOZx1EaVlkcOL9g+aUa6shfUE4lV5iEpmxrO wS8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732146161; x=1732750961; 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=1XxtWDrswZS9YG0rGeDJ9eQZkZ7ZWzi9jwU23ZVveUc=; b=lr9knTdhh9ZWqc8HPeNZEtkK1xiPuvcnl+4NipGYe5lgK6tqwBV0rS0pYtV6NG63LD 1v6mnfCaTmTcrXRI+ykRKemL1y0a8ZeLQSKc/w0Z37RXRKZbAfRs3KRtkkMw19+BXr6A v7Vxcl6rX+J1cmiarxzeuak/WkPEnfUW+LrZ8iXbL/EUS7Zcg3mgzM+qUh1PQr9RC1lu F0X49K0LuB0ebJEYjG5/2khWgJ9JcEjEm51CntpaRhNEVQWYvEQEDsuqqN617CgHsghv kBMXhRYdZlm6BsEVyACJRxmbO8nnDzT0VfElvRv/0xAGUlbGzG2CBbzeGvUQ3i3nm65F FRAQ== X-Gm-Message-State: AOJu0YyqHR7vlBc0sbx5B++wNkKRzmBuM5XMOU2lTS7hbp0Q88dKm5k7 fIE9RJZ4VU5+27rJHk7okaVcqTyKBljeRyXTQMwsk/qnyErGFyjy2gPq/Y1M X-Google-Smtp-Source: AGHT+IHSO8YSQMLO3BQzVg+wS1NsbIvwPRWH8zZ8foGziwyvWNQMiwmMGxmJ0VYpwEsGnhA22sBxmA== X-Received: by 2002:a05:600d:9:b0:42c:c401:6d67 with SMTP id 5b1f17b1804b1-433a4caad5amr35061525e9.6.1732146161355; Wed, 20 Nov 2024 15:42:41 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433b01e1170sm36055025e9.3.2024.11.20.15.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 15:42:40 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: remove dead conditional' has been queued to stable release 22.11.7 Date: Wed, 20 Nov 2024 23:41:31 +0000 Message-ID: <20241120234215.233355-6-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/17006eb028a2123dafec547c18f3aa88a161246e Thanks. Luca Boccassi --- >From 17006eb028a2123dafec547c18f3aa88a161246e 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 @@ -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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-20 23:41:22.953664816 +0000 +++ 0006-net-bnx2x-remove-dead-conditional.patch 2024-11-20 23:41:22.688195466 +0000 @@ -1 +1 @@ -From 3868c0ce5ce83eacc9611cc4a83d20120ae3442e Mon Sep 17 00:00:00 2001 +From 17006eb028a2123dafec547c18f3aa88a161246e 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 @@ -@@ -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 +27 @@ -- if (sc->stats_pending) +- if (sc->stats_pending) { @@ -27,0 +29 @@ +- }