diff options
| author | David S. Miller <[email protected]> | 2021-10-07 11:38:15 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-10-07 11:38:15 +0000 |
| commit | 65f280bb65e60fd75ca6cca51c4311a4fc7af222 (patch) | |
| tree | 93db707f465fba18bf00fb527ab47bdeb5371be3 /drivers/net/ethernet/intel/iavf/iavf_main.c | |
| parent | dt-bindings: net: dsa: marvell: fix compatible in example (diff) | |
| parent | iavf: fix double unlock of crit_lock (diff) | |
| download | kernel-65f280bb65e60fd75ca6cca51c4311a4fc7af222.tar.gz kernel-65f280bb65e60fd75ca6cca51c4311a4fc7af222.zip | |
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-10-06
This series contains updates to i40e and iavf drivers.
Jiri Benc expands an error check to prevent infinite loop for i40e.
Sylwester prevents freeing of uninitialized IRQ vector to resolve a
kernel oops for i40e.
Stefan Assmann fixes a double mutex unlock for iavf.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/iavf/iavf_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/iavf/iavf_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 23762a7ef740..cada4e0e40b4 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1965,7 +1965,6 @@ 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)); |