* [dpdk-dev] [PATCH v3] net/ixgbe: fix offset value check
@ 2019-08-08 0:37 Congwen Zhang
2019-08-08 11:30 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
0 siblings, 1 reply; 2+ messages in thread
From: Congwen Zhang @ 2019-08-08 0:37 UTC (permalink / raw)
To: wenzhuo.lu; +Cc: dev, stable, Congwen Zhang
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@dpdk.org
Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
Acked-by: Xiaolong Ye <xiaolong.ye@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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH v3] net/ixgbe: fix offset value check
2019-08-08 0:37 [dpdk-dev] [PATCH v3] net/ixgbe: fix offset value check Congwen Zhang
@ 2019-08-08 11:30 ` Thomas Monjalon
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Monjalon @ 2019-08-08 11:30 UTC (permalink / raw)
To: Congwen Zhang; +Cc: stable, wenzhuo.lu, dev, qi.z.zhang
08/08/2019 02:37, Congwen Zhang:
> 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@dpdk.org
>
> Signed-off-by: Congwen Zhang <zhang.congwen@zte.com.cn>
> Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Applied, thanks
Note: it looks simple enough to be merged in 19.08 post rc4.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-08 11:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-08 0:37 [dpdk-dev] [PATCH v3] net/ixgbe: fix offset value check Congwen Zhang
2019-08-08 11:30 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).