Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffcc55c0 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e: Add support for ATR w/ IPv6 extension headers 



This patch updates the code for determining the L4 protocol and L3 header
length so that when IPv6 extension headers are being used we can determine
the offset and type of the L4 protocol.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f608e6a6

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

+13 −15
Original line number Diff line number Diff line
@@ -2044,7 +2044,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	struct tcphdr *th;

	unsigned int hlen;

	u32 flex_ptype, dtype_cmd;

	u8 l4_proto;

	int l4_proto;

	u16 i;



	/* make sure ATR is enabled */
@@ -2062,25 +2062,23 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	if (!(tx_flags & (I40E_TX_FLAGS_IPV4 | I40E_TX_FLAGS_IPV6)))

		return;



	if (!(tx_flags & I40E_TX_FLAGS_UDP_TUNNEL)) {

	/* snag network header to get L4 type and address */

		hdr.network = skb_network_header(skb);

	hdr.network = (tx_flags & I40E_TX_FLAGS_UDP_TUNNEL) ?

		      skb_inner_network_header(skb) : skb_network_header(skb);



	/* Note: tx_flags gets modified to reflect inner protocols in

	 * tx_enable_csum function if encap is enabled.

	 */

	if (tx_flags & I40E_TX_FLAGS_IPV4) {

		/* access ihl as u8 to avoid unaligned access on ia64 */

		if (tx_flags & I40E_TX_FLAGS_IPV4)

		hlen = (hdr.network[0] & 0x0F) << 2;

		else

			hlen = sizeof(struct ipv6hdr);

		l4_proto = hdr.ipv4->protocol;

	} else {

		hdr.network = skb_inner_network_header(skb);

		hlen = skb_inner_network_header_len(skb);

		hlen = hdr.network - skb->data;

		l4_proto = ipv6_find_hdr(skb, &hlen, IPPROTO_TCP, NULL, NULL);

		hlen -= hdr.network - skb->data;

	}



	/* Note: tx_flags gets modified to reflect inner protocols in

	 * tx_enable_csum function if encap is enabled.

	 */

	l4_proto = (tx_flags & I40E_TX_FLAGS_IPV4) ? hdr.ipv4->protocol :

						     hdr.ipv6->nexthdr;

	if (l4_proto != IPPROTO_TCP)

		return;