From a8562b09c1c2fd2b76a65e0c7ae574d405e1bb5a Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Wed, 30 Jan 2019 16:23:46 +0800 Subject: [PATCH] net/ice: fix crash on device detach Fix segment fault when detach a device due to some redundant function call in ice_dev_uninit. Fixes: f9cf4f864150 ("net/ice: support device initialization") Cc: stable@dpdk.org Signed-off-by: Qi Zhang Acked-by: Wenzhuo Lu --- drivers/net/ice/ice_ethdev.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 6ab66faebc..6b0113b373 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1458,15 +1458,14 @@ ice_dev_close(struct rte_eth_dev *dev) ice_res_pool_destroy(&pf->msix_pool); ice_release_vsi(pf->main_vsi); - + ice_sched_cleanup_all(hw); + rte_free(hw->port_info); ice_shutdown_all_ctrlq(hw); } static int ice_dev_uninit(struct rte_eth_dev *dev) { - struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; @@ -1486,11 +1485,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) rte_intr_callback_unregister(intr_handle, ice_interrupt_handler, dev); - ice_release_vsi(pf->main_vsi); - ice_sched_cleanup_all(hw); - rte_free(hw->port_info); - ice_shutdown_all_ctrlq(hw); - return 0; } -- 2.20.1