Commit a41c4d96 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-12-13

This series contains updates to iavf driver only.

Dan Carpenter fixes some missing mutex unlocking.

Stefan Assmann restores stopping watchdog from overriding to reset state.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 166b6a46 fe523d7c

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

+2 −3
Original line number Diff line number Diff line
@@ -2046,6 +2046,7 @@ static void iavf_watchdog_task(struct work_struct *work) 
		}

		adapter->aq_required = 0;

		adapter->current_op = VIRTCHNL_OP_UNKNOWN;

		mutex_unlock(&adapter->crit_lock);

		queue_delayed_work(iavf_wq,

				   &adapter->watchdog_task,

				   msecs_to_jiffies(10));
@@ -2076,16 +2077,14 @@ static void iavf_watchdog_task(struct work_struct *work) 
			iavf_detect_recover_hung(&adapter->vsi);

		break;

	case __IAVF_REMOVE:

		mutex_unlock(&adapter->crit_lock);

		return;

	default:

		mutex_unlock(&adapter->crit_lock);

		return;

	}



	/* check for hw reset */

	reg_val = rd32(hw, IAVF_VF_ARQLEN1) & IAVF_VF_ARQLEN1_ARQENABLE_MASK;

	if (!reg_val) {

		iavf_change_state(adapter, __IAVF_RESETTING);

		adapter->flags |= IAVF_FLAG_RESET_PENDING;

		adapter->aq_required = 0;

		adapter->current_op = VIRTCHNL_OP_UNKNOWN;