From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 23 Feb 2021 03:14:47 +0000 (-0800)
Subject: Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
X-Git-Tag: v5.15~1635^2~21
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=42870a1a8728ec3c35a12aaf078eaefa0f042772;p=mirror_ubuntu-kernels.git

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-02-19

This series contains updates to i40e driver only.

Slawomir resolves an issue with the IPv6 extension headers being
processed incorrectly.

Keita Suzuki fixes a memory leak on probe failure.

Mateusz initializes AQ command structures to zero to comply with
spec, fixes FW flow control settings being overwritten and resolves an
issue with adding VLAN filters after enabling FW LLDP. He also adds
an additional check when adding TC filter as the current check doesn't
properly distinguish between IPv4 and IPv6.

Sylwester removes setting disabled bit when syncing filters as this
prevents VFs from completing setup.

Norbert cleans up sparse warnings.

v2:
- Fix fixes tag on patch 7

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: Fix endianness conversions
  i40e: Fix add TC filter for IPv6
  i40e: Fix VFs not created
  i40e: Fix addition of RX filters after enabling FW LLDP agent
  i40e: Fix overwriting flow control settings during driver loading
  i40e: Add zero-initialization of AQ command structures
  i40e: Fix memory leak in i40e_probe
  i40e: Fix flow for IPv6 next header (extension header)
====================

Link: https://lore.kernel.org/r/20210219213606.2567536-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

42870a1a8728ec3c35a12aaf078eaefa0f042772
diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 8bb8eb65add9,4a2d03cada01..353deae139f9
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -8938,8 -8542,12 +8937,12 @@@ void i40e_do_reset(struct i40e_pf *pf, 
  		 *
  		 * Resets PF and reinitializes PFs VSI.
  		 */
 -		i40e_prep_for_reset(pf, lock_acquired);
 +		i40e_prep_for_reset(pf);
  		i40e_reset_and_rebuild(pf, true, lock_acquired);
+ 		dev_info(&pf->pdev->dev,
+ 			 pf->flags & I40E_FLAG_DISABLE_FW_LLDP ?
+ 			 "FW LLDP is disabled\n" :
+ 			 "FW LLDP is enabled\n");
  
  	} else if (reset_flags & BIT_ULL(__I40E_REINIT_REQUESTED)) {
  		int v;