Change txgbe_dev_stop return value from void to int, refer to the changes in main repo.
Signed-off-by: Jiawen Wu <jiawe...@trustnetic.com> --- drivers/net/txgbe/txgbe_ethdev.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 87824b140..aeefb1ed1 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1602,7 +1602,7 @@ txgbe_dev_start(struct rte_eth_dev *dev) /* * Stop device: disable rx and tx functions to allow for reconfiguring. */ -static void +static int txgbe_dev_stop(struct rte_eth_dev *dev) { struct rte_eth_link link; @@ -1614,7 +1614,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev) int vf; if (hw->adapter_stopped) - return; + return 0; PMD_INIT_FUNC_TRACE(); @@ -1668,6 +1668,9 @@ txgbe_dev_stop(struct rte_eth_dev *dev) wr32m(hw, TXGBE_LEDCTL, 0xFFFFFFFF, TXGBE_LEDCTL_SEL_MASK); hw->adapter_stopped = true; + dev->data->dev_started = 0; + + return 0; } /* @@ -1726,17 +1729,13 @@ txgbe_dev_close(struct rte_eth_dev *dev) txgbe_pf_reset_hw(hw); - txgbe_dev_stop(dev); + ret = txgbe_dev_stop(dev); txgbe_dev_free_queues(dev); /* reprogram the RAR[0] in case user changed it. */ txgbe_set_rar(hw, 0, hw->mac.addr, 0, true); - dev->dev_ops = NULL; - dev->rx_pkt_burst = NULL; - dev->tx_pkt_burst = NULL; - /* Unlock any pending hardware semaphore */ txgbe_swfw_lock_reset(hw); @@ -1768,7 +1767,7 @@ txgbe_dev_close(struct rte_eth_dev *dev) rte_free(dev->data->hash_mac_addrs); dev->data->hash_mac_addrs = NULL; - return 0; + return ret; } /* -- 2.18.4