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

Commit bee5a188 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Refactor tunneled hardware GRO logic. 



The 2 GRO functions to set up the hardware GRO SKB fields for 2
different hardware chips have practically identical logic for
tunneled packets.  Refactor the logic into a separate bnxt_gro_tunnel()
function that can be used by both functions.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fe88ce7

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+28 −41
Original line number Diff line number Diff line
@@ -1207,6 +1207,31 @@ static void bnxt_abort_tpa(struct bnxt_cp_ring_info *cpr, u16 idx, u32 agg_bufs) 
		bnxt_reuse_rx_agg_bufs(cpr, idx, 0, agg_bufs, true);

}



#ifdef CONFIG_INET

static void bnxt_gro_tunnel(struct sk_buff *skb, __be16 ip_proto)

{

	struct udphdr *uh = NULL;



	if (ip_proto == htons(ETH_P_IP)) {

		struct iphdr *iph = (struct iphdr *)skb->data;



		if (iph->protocol == IPPROTO_UDP)

			uh = (struct udphdr *)(iph + 1);

	} else {

		struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;



		if (iph->nexthdr == IPPROTO_UDP)

			uh = (struct udphdr *)(iph + 1);

	}

	if (uh) {

		if (uh->check)

			skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;

		else

			skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL;

	}

}

#endif



static struct sk_buff *bnxt_gro_func_5731x(struct bnxt_tpa_info *tpa_info,

					   int payload_off, int tcp_ts,

					   struct sk_buff *skb)
@@ -1264,28 +1289,10 @@ static struct sk_buff *bnxt_gro_func_5731x(struct bnxt_tpa_info *tpa_info, 
	}



	if (inner_mac_off) { /* tunnel */

		struct udphdr *uh = NULL;

		__be16 proto = *((__be16 *)(skb->data + outer_ip_off -

					    ETH_HLEN - 2));



		if (proto == htons(ETH_P_IP)) {

			struct iphdr *iph = (struct iphdr *)skb->data;



			if (iph->protocol == IPPROTO_UDP)

				uh = (struct udphdr *)(iph + 1);

		} else {

			struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;



			if (iph->nexthdr == IPPROTO_UDP)

				uh = (struct udphdr *)(iph + 1);

		}

		if (uh) {

			if (uh->check)

				skb_shinfo(skb)->gso_type |=

					SKB_GSO_UDP_TUNNEL_CSUM;

			else

				skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL;

		}

		bnxt_gro_tunnel(skb, proto);

	}

#endif

	return skb;
@@ -1332,28 +1339,8 @@ static struct sk_buff *bnxt_gro_func_5730x(struct bnxt_tpa_info *tpa_info, 
		return NULL;

	}



	if (nw_off) { /* tunnel */

		struct udphdr *uh = NULL;



		if (skb->protocol == htons(ETH_P_IP)) {

			struct iphdr *iph = (struct iphdr *)skb->data;



			if (iph->protocol == IPPROTO_UDP)

				uh = (struct udphdr *)(iph + 1);

		} else {

			struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;



			if (iph->nexthdr == IPPROTO_UDP)

				uh = (struct udphdr *)(iph + 1);

		}

		if (uh) {

			if (uh->check)

				skb_shinfo(skb)->gso_type |=

					SKB_GSO_UDP_TUNNEL_CSUM;

			else

				skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL;

		}

	}

	if (nw_off) /* tunnel */

		bnxt_gro_tunnel(skb, skb->protocol);

#endif

	return skb;

}