Skip to content

Commit 6a0d989

Browse files
michichkuba-moo
authored andcommitted
iavf: in iavf_down, don't queue watchdog_task if comms failed
The reason for queueing watchdog_task is to have it process the aq_required flags that are being set here. If comms failed, there's nothing to do, so return early. Signed-off-by: Michal Schmidt <[email protected]> Reviewed-by: Wojciech Drewek <[email protected]> Tested-by: Rafal Romanowski <[email protected]> Signed-off-by: Jacob Keller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 5902ee6 commit 6a0d989

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/net/ethernet/intel/iavf/iavf_main.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,8 +1420,10 @@ void iavf_down(struct iavf_adapter *adapter)
14201420
iavf_clear_fdir_filters(adapter);
14211421
iavf_clear_adv_rss_conf(adapter);
14221422

1423-
if (!(adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) &&
1424-
!(test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section))) {
1423+
if (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)
1424+
return;
1425+
1426+
if (!test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {
14251427
/* cancel any current operation */
14261428
adapter->current_op = VIRTCHNL_OP_UNKNOWN;
14271429
/* Schedule operations to close down the HW. Don't wait

0 commit comments

Comments
 (0)