提交 3b867b28 编写于 作者: A Anjali Singhai Jain 提交者: Jeff Kirsher

i40e: do not bail when disabling if Tx queue disable fails

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: NAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: NJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: NKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
上级 5f90f422
...@@ -3113,7 +3113,7 @@ static int i40e_vsi_control_rx(struct i40e_vsi *vsi, bool enable) ...@@ -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 i40e_vsi_control_rings(struct i40e_vsi *vsi, bool request)
{ {
int ret; int ret = 0;
/* do rx first for enable and last for disable */ /* do rx first for enable and last for disable */
if (request) { if (request) {
...@@ -3122,10 +3122,9 @@ int i40e_vsi_control_rings(struct i40e_vsi *vsi, bool request) ...@@ -3122,10 +3122,9 @@ int i40e_vsi_control_rings(struct i40e_vsi *vsi, bool request)
return ret; return ret;
ret = i40e_vsi_control_tx(vsi, request); ret = i40e_vsi_control_tx(vsi, request);
} else { } else {
ret = i40e_vsi_control_tx(vsi, request); /* Ignore return value, we need to shutdown whatever we can */
if (ret) i40e_vsi_control_tx(vsi, request);
return ret; i40e_vsi_control_rx(vsi, request);
ret = i40e_vsi_control_rx(vsi, request);
} }
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册