On 11/1/2021 12:39 PM, Ferruh Yigit wrote:
On 11/1/2021 9:23 AM, Jiawen Wu wrote:
On October 22, 2021 7:03 PM, Ferruh Yigit wrote:

diff --git a/drivers/net/txgbe/txgbe_ethdev.c
b/drivers/net/txgbe/txgbe_ethdev.c
index 7b46ffb68635..0b0f9db7cb2a 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2695,11 +2695,11 @@ txgbe_dev_link_update_share(struct rte_eth_dev
*dev,
      int wait = 1;

      memset(&link, 0, sizeof(link));
-    link.link_status = ETH_LINK_DOWN;
-    link.link_speed = ETH_SPEED_NUM_NONE;
-    link.link_duplex = ETH_LINK_HALF_DUPLEX;
+    link.link_status = RTE_ETH_LINK_DOWN;
+    link.link_speed = RTE_ETH_SPEED_NUM_NONE;
+    link.link_duplex = RTE_ETH_LINK_HALF_DUPLEX;
      link.link_autoneg = !(dev->data->dev_conf.link_speeds &
-            ETH_LINK_SPEED_FIXED);
+            RTE_ETH_LINK_AUTONEG);


Hi Ferruh,
Is there some wrong that 'ETH_LINK_SPEED_FIXED' is changed to
auto-negotiation?


Not sure how it happened, but I will send a patch to fix it.

Ahh, there is another driver change [1] between this patch versions,
that seems lead the conflict resolve error.

[1]
Commit 196f0e123bcb ("net/txgbe: set fixed flag for exact link speed")

 -       link.link_autoneg = ETH_LINK_AUTONEG;
 +       link.link_autoneg = !(dev->data->dev_conf.link_speeds &
 +                       ETH_LINK_SPEED_FIXED);

Reply via email to