[dpdk-stable] patch 'net/ixgbe/base: fix product version check' has been queued to LTS release 18.11.3

[Kevin Traynor]

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 <zhang.congwen at zte.com.cn>
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 <zhang.congwen at zte.com.cn>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 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 at dpdk.org