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

Commit 45991204 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e/i40evf: Simplify tunnel selection logic 



Use l4_tunnel type generically to keep code flow simple.

Change-ID: Ic52287e3b1ca4204e6b6e13431890c1a6ae9c422
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 04294e38

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

+10 −2
Original line number Diff line number Diff line
@@ -2216,8 +2216,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
	struct iphdr *this_ip_hdr;

	u32 network_hdr_len;

	u8 l4_hdr = 0;

	u32 l4_tunnel = 0;



	if (skb->encapsulation) {

		switch (ip_hdr(skb)->protocol) {

		case IPPROTO_UDP:

			l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;

			break;

		default:

			return;

		}

		network_hdr_len = skb_inner_network_header_len(skb);

		this_ip_hdr = inner_ip_hdr(skb);

		this_ipv6_hdr = inner_ipv6_hdr(skb);
@@ -2241,7 +2249,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
		/* Now set the ctx descriptor fields */

		*cd_tunneling |= (skb_network_header_len(skb) >> 2) <<

				   I40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT      |

				   I40E_TXD_CTX_UDP_TUNNELING            |

				   l4_tunnel                             |

				   ((skb_inner_network_offset(skb) -

					skb_transport_offset(skb)) >> 1) <<

				   I40E_TXD_CTX_QW0_NATLEN_SHIFT;

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

+10 −2
Original line number Diff line number Diff line
@@ -1461,8 +1461,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
	struct iphdr *this_ip_hdr;

	u32 network_hdr_len;

	u8 l4_hdr = 0;

	u32 l4_tunnel = 0;



	if (skb->encapsulation) {

		switch (ip_hdr(skb)->protocol) {

		case IPPROTO_UDP:

			l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;

			break;

		default:

			return;

		}

		network_hdr_len = skb_inner_network_header_len(skb);

		this_ip_hdr = inner_ip_hdr(skb);

		this_ipv6_hdr = inner_ipv6_hdr(skb);
@@ -1486,7 +1494,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
		/* Now set the ctx descriptor fields */

		*cd_tunneling |= (skb_network_header_len(skb) >> 2) <<

				   I40E_TXD_CTX_QW0_EXT_IPLEN_SHIFT      |

				   I40E_TXD_CTX_UDP_TUNNELING            |

				   l4_tunnel                             |

				   ((skb_inner_network_offset(skb) -

					skb_transport_offset(skb)) >> 1) <<

				   I40E_TXD_CTX_QW0_NATLEN_SHIFT;