Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c38d7e0d authored by Henry Orosco's avatar Henry Orosco Committed by Doug Ledford
Browse files

i40iw: Fix for LAN handler removal 



If i40iw_open() fails for any reason, the LAN handler
is not being removed. Modify i40iw_deinit_device()
to always remove the handler.

Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarHenry Orosco <henry.orosco@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 01d0b367

drivers/infiniband/hw/i40iw/i40iw_main.c

+4 −6
Original line number Diff line number Diff line
@@ -1422,12 +1422,11 @@ static enum i40iw_status_code i40iw_save_msix_info(struct i40iw_device *iwdev, 
 * i40iw_deinit_device - clean up the device resources

 * @iwdev: iwarp device

 * @reset: true if called before reset

 * @del_hdl: true if delete hdl entry

 *

 * Destroy the ib device interface, remove the mac ip entry and ipv4/ipv6 addresses,

 * destroy the device queues and free the pble and the hmc objects

 */

static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset, bool del_hdl)

static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset)

{

	struct i40e_info *ldev = iwdev->ldev;
@@ -1492,7 +1491,6 @@ static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset, bool del 
		break;

	}



	if (del_hdl)

	i40iw_del_handler(i40iw_find_i40e_handler(ldev));

	kfree(iwdev->hdl);

}
@@ -1658,7 +1656,7 @@ static int i40iw_open(struct i40e_info *ldev, struct i40e_client *client) 
	} while (0);



	i40iw_pr_err("status = %d last completion = %d\n", status, iwdev->init_state);

	i40iw_deinit_device(iwdev, false, false);

	i40iw_deinit_device(iwdev, false);

	return -ERESTART;

}
@@ -1736,7 +1734,7 @@ static void i40iw_close(struct i40e_info *ldev, struct i40e_client *client, bool 


	iwdev = &hdl->device;

	destroy_workqueue(iwdev->virtchnl_wq);

	i40iw_deinit_device(iwdev, reset, true);

	i40iw_deinit_device(iwdev, reset);

}



/**