Skip to content

Commit fe523d7

Browse files
sassmannanguy11
authored andcommitted
iavf: do not override the adapter state in the watchdog task (again)
The watchdog task incorrectly changes the state to __IAVF_RESETTING, instead of letting the reset task take care of that. This was already resolved by commit 22c8fd7 ("iavf: do not override the adapter state in the watchdog task") but the problem was reintroduced by the recent code refactoring in commit 45eebd6 ("iavf: Refactor iavf state machine tracking"). Fixes: 45eebd6 ("iavf: Refactor iavf state machine tracking") Signed-off-by: Stefan Assmann <sassmann@kpanic.de> Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent bc2f39a commit fe523d7

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,6 @@ static void iavf_watchdog_task(struct work_struct *work)
20852085
/* check for hw reset */
20862086
reg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;
20872087
if (!reg_val) {
2088-
iavf_change_state(adapter, __IAVF_RESETTING);
20892088
adapter->flags |= IAVF_FLAG_RESET_PENDING;
20902089
adapter->aq_required = 0;
20912090
adapter->current_op = VIRTCHNL_OP_UNKNOWN;

0 commit comments

Comments
 (0)