i40e: do not bail when disabling if Tx queue disable fails (3b867b28) · Commits · 戴 / test

Fix a bug where the driver was erroneously exiting the driver unload path if one part of the unload failed. Instead of the original way the driver should always continue when disabling and be sure to disable all queues. Change-ID: Ib8c81c596bc87c31d8e9ca97ebf871168475279d Signed-off-by:

Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by:

Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by:

Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/i40e/i40e_main.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -3113,7 +3113,7 @@ static int i40e_vsi_control_rx(struct i40e_vsi *vsi, bool enable)
		**/
		int i40e_vsi_control_rings(struct i40e_vsi *vsi, bool request)
		{
		int ret;
		int ret = 0;

		/* do rx first for enable and last for disable */
		if (request) {
		@@ -3122,10 +3122,9 @@ int i40e_vsi_control_rings(struct i40e_vsi *vsi, bool request)
		return ret;
		ret = i40e_vsi_control_tx(vsi, request);
		} else {
		ret = i40e_vsi_control_tx(vsi, request);
		if (ret)
		return ret;
		ret = i40e_vsi_control_rx(vsi, request);
		/* Ignore return value, we need to shutdown whatever we can */
		i40e_vsi_control_tx(vsi, request);
		i40e_vsi_control_rx(vsi, request);
		}

		return ret;

Admin message