Commit ed16d19c authored Aug 17, 2022 by David S. Miller

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



====================
Intel Wired LAN Driver Updates 2022-08-16)

This series contains updates to i40e driver only.

Przemyslaw fixes issue with checksum offload on VXLAN tunnels.

Alan disables VSI for Tx timeout when all recovery methods have failed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 849f16bb 57c942bc

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,9 @@ static void i40e_tx_timeout(struct net_device *netdev, unsigned int txqueue)
		set_bit(__I40E_GLOBAL_RESET_REQUESTED, pf->state);
		break;
		default:
		netdev_err(netdev, "tx_timeout recovery unsuccessful\n");
		netdev_err(netdev, "tx_timeout recovery unsuccessful, device is in non-recoverable state.\n");
		set_bit(__I40E_DOWN_REQUESTED, pf->state);
		set_bit(__I40E_VSI_DOWN_REQUESTED, vsi->state);
		break;
		}

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -3203,11 +3203,13 @@ static int i40e_tx_enable_csum(struct sk_buff skb, u32 tx_flags,

		protocol = vlan_get_protocol(skb);

		if (eth_p_mpls(protocol))
		if (eth_p_mpls(protocol)) {
		ip.hdr = skb_inner_network_header(skb);
		else
		ip.hdr = skb_network_header(skb);
		l4.hdr = skb_checksum_start(skb);
		} else {
		ip.hdr = skb_network_header(skb);
		l4.hdr = skb_transport_header(skb);
		}

		/* set the tx_flags to indicate the IP protocol type. this is
		* required so that checksum header computation below is accurate.