Hi, Beilei

-----Original Message-----
From: Xing, Beilei <redacted>
Sent: Monday, September 27, 2021 5:18 PM
To: Zhang, RobinX <redacted>; dev@dpdk.org
Cc: Zhang, Qi Z <redacted>; Zhang, Helin
[off-list ref]; Wu, Jingjing [off-list ref];
remy.horton@intel.com; jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu,
Heqing [off-list ref]; Liang, Cunming
[off-list ref]; Lu, Wenzhuo [off-list ref]; Zhang,
Roy Fan [off-list ref]; Chilikin, Andrey
[off-list ref]; echaudro@redhat.com; Guo, Junfeng
[off-list ref]; Yang, SteveX [off-list ref]
Subject: RE: [PATCH v4 18/18] net/i40e: fix redefinition warning

quoted

-----Original Message-----
From: Zhang, RobinX <redacted>
Sent: Monday, September 6, 2021 10:03 AM
To: dev@dpdk.org
Cc: Xing, Beilei <redacted>; Zhang, Qi Z
[off-list ref]; Zhang, Helin [off-list ref]; Wu,
Jingjing [off-list ref]; remy.horton@intel.com;
jijiang.liu@intel.com; jing.d.chen@intel.com; Zhu, Heqing
[off-list ref]; Liang, Cunming [off-list ref]; Lu,
Wenzhuo [off-list ref]; Zhang, Roy Fan
[off-list ref]; Chilikin, Andrey
[off-list ref]; echaudro@redhat.com; Guo, Junfeng
[off-list ref]; Yang, SteveX [off-list ref]; Zhang,
RobinX [off-list ref]
Subject: [PATCH v4 18/18] net/i40e: fix redefinition warning

After update i40e share code, there will be a redefinition compile warning.
This patch fix the situation by remove duplicate definition in
i40e_ethdev.c

Fixes: eef2daf2e199 ("net/i40e: fix link update no wait")

Need to cc stable?

This patch is dependent on share code, so cannot cc stable.

quoted

Signed-off-by: Robin Zhang <redacted>
---
 drivers/net/i40e/i40e_ethdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c

b/drivers/net/i40e/i40e_ethdev.c index 7b230e2ed1..4fc44dc5e2 100644

--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c

@@ -2886,7 +2886,6 @@ static __rte_always_inline void

update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)  {
 /* Link status registers and values*/
-#define I40E_PRTMAC_LINKSTA		0x001E2420
 #define I40E_REG_LINK_UP		0x40000080
 #define I40E_PRTMAC_MACC		0x001E24E0
 #define I40E_REG_MACC_25GB		0x00020000

@@ -2899,7 +2898,7 @@ update_link_reg(struct i40e_hw *hw, struct

rte_eth_link *link)
 	uint32_t link_speed;
 	uint32_t reg_val;

-	reg_val = I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA);
+	reg_val = I40E_READ_REG(hw, I40E_PRTMAC_LINKSTA(0));
 	link_speed = reg_val & I40E_REG_SPEED_MASK;
 	reg_val &= I40E_REG_LINK_UP;
 	link->link_status = (reg_val == I40E_REG_LINK_UP) ? 1 : 0;
--
2.25.1