From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA87DA2E1B for ; Thu, 5 Sep 2019 12:19:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9FEB21EF74; Thu, 5 Sep 2019 12:19:41 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 217041EF8D for ; Thu, 5 Sep 2019 12:19:40 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E1C910C6978; Thu, 5 Sep 2019 10:19:39 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98D7C19C77; Thu, 5 Sep 2019 10:19:38 +0000 (UTC) From: Kevin Traynor To: Congwen Zhang Cc: Xiaolong Ye , dpdk stable Date: Thu, 5 Sep 2019 11:17:52 +0100 Message-Id: <20190905101754.21933-52-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Thu, 05 Sep 2019 10:19:39 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe/base: fix product version check' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 09/12/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7f74d18bc553a4dbf5457a728cd24cb9f0a98c53 Thanks. Kevin Traynor --- >From 7f74d18bc553a4dbf5457a728cd24cb9f0a98c53 Mon Sep 17 00:00:00 2001 From: Congwen Zhang Date: Thu, 8 Aug 2019 08:37:20 +0800 Subject: [PATCH] net/ixgbe/base: fix product version check [ upstream commit 1861e3a66ffb7fa33e7767649c7091f1900c8808 ] The "and" condition offset == 0 && offset == NVM_INVALID_PTR can never be true. Fixes: cf3af5aa56c9 ("net/ixgbe/base: add functions to get version info") Signed-off-by: Congwen Zhang Acked-by: Xiaolong Ye --- drivers/net/ixgbe/base/ixgbe_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index fb50719fb..62ff76723 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -5041,5 +5041,5 @@ void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw, /* Return is offset to OEM Product Version block is invalid */ - if (offset == 0x0 && offset == NVM_INVALID_PTR) + if (offset == 0x0 || offset == NVM_INVALID_PTR) return; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:50.652432716 +0100 +++ 0052-net-ixgbe-base-fix-product-version-check.patch 2019-09-05 10:36:47.567699158 +0100 @@ -1 +1 @@ -From 1861e3a66ffb7fa33e7767649c7091f1900c8808 Mon Sep 17 00:00:00 2001 +From 7f74d18bc553a4dbf5457a728cd24cb9f0a98c53 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1861e3a66ffb7fa33e7767649c7091f1900c8808 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org