Commit cad4fb02 authored by Jakub Kicinski's avatar Jakub Kicinski
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 2023-03-21 (iavf, i40e)

This series contains updates to iavf and i40e drivers.

Stefan Assmann adds check, and return, if driver has already gone
through remove to prevent hang for iavf.

Radoslaw adds zero initialization to ensure Flow Director packets are
populated with correct values for i40e.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  i40e: fix flow director packet filter programming
  iavf: fix hang on reboot with ice
====================

Link: https://lore.kernel.org/r/20230321183548.2849671-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 407b508b c672297b

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

+4 −4
Original line number Diff line number Diff line
@@ -171,10 +171,10 @@ static char *i40e_create_dummy_packet(u8 *dummy_packet, bool ipv4, u8 l4proto, 
				      struct i40e_fdir_filter *data)

{

	bool is_vlan = !!data->vlan_tag;

	struct vlan_hdr vlan;

	struct ipv6hdr ipv6;

	struct ethhdr eth;

	struct iphdr ip;

	struct vlan_hdr vlan = {};

	struct ipv6hdr ipv6 = {};

	struct ethhdr eth = {};

	struct iphdr ip = {};

	u8 *tmp;



	if (ipv4) {

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

+5 −0
Original line number Diff line number Diff line
@@ -5074,6 +5074,11 @@ static void iavf_remove(struct pci_dev *pdev) 
			mutex_unlock(&adapter->crit_lock);

			break;

		}

		/* Simply return if we already went through iavf_shutdown */

		if (adapter->state == __IAVF_REMOVE) {

			mutex_unlock(&adapter->crit_lock);

			return;

		}



		mutex_unlock(&adapter->crit_lock);

		usleep_range(500, 1000);