From: Stephen Hemminger <step...@networkplumber.org>

Use the new link update API, and cleanup the logic in the the
link update routine.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Tested-by: Shijith Thotton <shijith.thot...@caviumnetworks.com>
Reviewed-by: Ferruh Yigit <ferruh.yi...@intel.com>
---
 drivers/net/liquidio/lio_ethdev.c | 56 +++++++--------------------------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/drivers/net/liquidio/lio_ethdev.c 
b/drivers/net/liquidio/lio_ethdev.c
index 8f6ef6381..9adbcc12c 100644
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -904,32 +904,6 @@ lio_dev_vlan_filter_set(struct rte_eth_dev *eth_dev, 
uint16_t vlan_id, int on)
        return 0;
 }
 
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param eth_dev
- *   - Pointer to the structure rte_eth_dev to read from.
- *   - Pointer to the buffer to be saved with the link status.
- *
- * @return
- *   - On success, zero.
- *   - On failure, negative value.
- */
-static inline int
-lio_dev_atomic_write_link_status(struct rte_eth_dev *eth_dev,
-                                struct rte_eth_link *link)
-{
-       struct rte_eth_link *dst = &eth_dev->data->dev_link;
-       struct rte_eth_link *src = link;
-
-       if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
-                               *(uint64_t *)src) == 0)
-               return -1;
-
-       return 0;
-}
-
 static uint64_t
 lio_hweight64(uint64_t w)
 {
@@ -949,24 +923,17 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev,
                    int wait_to_complete __rte_unused)
 {
        struct lio_device *lio_dev = LIO_DEV(eth_dev);
-       struct rte_eth_link link, old;
-
-       /* Initialize */
-       link.link_status = ETH_LINK_DOWN;
-       link.link_speed = ETH_SPEED_NUM_NONE;
-       link.link_duplex = ETH_LINK_HALF_DUPLEX;
-       link.link_autoneg = ETH_LINK_AUTONEG;
-       memset(&old, 0, sizeof(old));
+       struct rte_eth_link link = {
+               .link_status = ETH_LINK_DOWN,
+               .link_speed = ETH_SPEED_NUM_NONE,
+               .link_duplex = ETH_LINK_HALF_DUPLEX,
+               .link_autoneg = ETH_LINK_AUTONEG,
+       };
 
        /* Return what we found */
-       if (lio_dev->linfo.link.s.link_up == 0) {
+       if (lio_dev->linfo.link.s.link_up == 0)
                /* Interface is down */
-               if (lio_dev_atomic_write_link_status(eth_dev, &link))
-                       return -1;
-               if (link.link_status == old.link_status)
-                       return -1;
-               return 0;
-       }
+               return rte_eth_linkstatus_set(eth_dev, &link);
 
        link.link_status = ETH_LINK_UP; /* Interface is up */
        link.link_duplex = ETH_LINK_FULL_DUPLEX;
@@ -982,12 +949,7 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev,
                link.link_duplex = ETH_LINK_HALF_DUPLEX;
        }
 
-       if (lio_dev_atomic_write_link_status(eth_dev, &link))
-               return -1;
-
-       if (link.link_status == old.link_status)
-               return -1;
-
+       rte_eth_linkstatus_set(eth_dev, &link);
        return 0;
 }
 
-- 
2.14.3

Reply via email to