[dpdk-dev] [PATCH v3] net/ixgbe: fix offset value check
Congwen Zhang
zhang.congwen at zte.com.cn
Thu Aug 8 02:37:20 CEST 2019
The "and" condition offset == 0 && offset == NVM_INVALID_PTR
can never be true.
Fixes: cf3af5aa56c9 ("net/ixgbe/base: add functions to get version info")
Cc: stable at dpdk.org
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 fb50719..62ff767 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -5040,7 +5040,7 @@ void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,
hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);
/* 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;
/* Read product version block */
--
1.8.3.1
More information about the dev
mailing list