diff options
| author |  Michal Schmidt <mschmidt@redhat.com>
| 2023-10-27 10:59:36 -0700 |
|---|---|---|
| committer |  Jakub Kicinski <kuba@kernel.org>
| 2023-10-27 15:35:49 -0700 |
| commit | 6a0d989d3cdb1b7653ca264ff41f4a4517a79500 (patch) | |
| tree | fde013dcf2013392c13b33c2d2db9f86e46819f9 /drivers/net/ethernet/intel/iavf | |
| parent | iavf: simplify mutex_trylock+sleep loops (diff) | |
| download | linux-6a0d989d3cdb1b7653ca264ff41f4a4517a79500.tar.gz linux-6a0d989d3cdb1b7653ca264ff41f4a4517a79500.tar.bz2 linux-6a0d989d3cdb1b7653ca264ff41f4a4517a79500.zip | |
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 <mschmidt@redhat.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231027175941.1340255-4-jacob.e.keller@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/iavf')
| -rw-r--r-- | drivers/net/ethernet/intel/iavf/iavf_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 502ebba2e879..38432455fe9e 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1420,8 +1420,10 @@ void iavf_down(struct iavf_adapter *adapter) iavf_clear_fdir_filters(adapter); iavf_clear_adv_rss_conf(adapter); - if (!(adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) && - !(test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section))) { + if (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED) + return; + + if (!test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) { /* cancel any current operation */ adapter->current_op = VIRTCHNL_OP_UNKNOWN; /* Schedule operations to close down the HW. Don't wait |