Commit 65f280bb authored Oct 07, 2021 by David S. Miller

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 <davem@davemloft.net>

parents a50a0595 54ee3943

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -4871,6 +4871,7 @@ static void i40e_clear_interrupt_scheme(struct i40e_pf *pf)
		{
		int i;

		if (test_bit(__I40E_MISC_IRQ_REQUESTED, pf->state))
		i40e_free_misc_vector(pf);

		i40e_put_lump(pf->irq_pile, pf->iwarp_base_vector,
		@@ -10113,7 +10114,7 @@ static int i40e_get_capabilities(struct i40e_pf *pf,
		if (pf->hw.aq.asq_last_status == I40E_AQ_RC_ENOMEM) {
		/* retry with a larger buffer */
		buf_len = data_size;
		} else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK) {
		} else if (pf->hw.aq.asq_last_status != I40E_AQ_RC_OK \|\| err) {
		dev_info(&pf->pdev->dev,
		"capability discovery failed, err %s aq_err %s\n",
		i40e_stat_str(&pf->hw, err),

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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));