Commit b41b45ec authored by Nick Child's avatar Nick Child Committed by Jakub Kicinski
Browse files

ibmvnic: Use header len helper functions on tx 



Use the header length helper functions rather than trying to calculate
it within the driver. There are defined functions for mac and network
headers (skb_mac_header_len and skb_network_header_len) but no such
function exists for the transport header length.

Also, hdr_data was memset during allocation to all 0's so no need to
memset again.

Signed-off-by: default avatarNick Child <nnac123@linux.ibm.com>
Link: https://patch.msgid.link/20240807211809.1259563-3-nnac123@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent dda10fc8

drivers/net/ethernet/ibm/ibmvnic.c

+3 −10
Original line number Diff line number Diff line
@@ -2156,36 +2156,28 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, 
	int len = 0;

	u8 *hdr;



	if (skb_vlan_tagged(skb) && !skb_vlan_tag_present(skb))

		hdr_len[0] = sizeof(struct vlan_ethhdr);

	else

		hdr_len[0] = sizeof(struct ethhdr);



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

		hdr_len[1] = ip_hdr(skb)->ihl * 4;

		if (ip_hdr(skb)->protocol == IPPROTO_TCP)

			hdr_len[2] = tcp_hdrlen(skb);

		else if (ip_hdr(skb)->protocol == IPPROTO_UDP)

			hdr_len[2] = sizeof(struct udphdr);

	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		hdr_len[1] = sizeof(struct ipv6hdr);

		if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)

			hdr_len[2] = tcp_hdrlen(skb);

		else if (ipv6_hdr(skb)->nexthdr == IPPROTO_UDP)

			hdr_len[2] = sizeof(struct udphdr);

	} else if (skb->protocol == htons(ETH_P_ARP)) {

		hdr_len[1] = arp_hdr_len(skb->dev);

		hdr_len[2] = 0;

	}



	memset(hdr_data, 0, 120);

	if ((hdr_field >> 6) & 1) {

		hdr_len[0] = skb_mac_header_len(skb);

		hdr = skb_mac_header(skb);

		memcpy(hdr_data, hdr, hdr_len[0]);

		len += hdr_len[0];

	}



	if ((hdr_field >> 5) & 1) {

		hdr_len[1] = skb_network_header_len(skb);

		hdr = skb_network_header(skb);

		memcpy(hdr_data + len, hdr, hdr_len[1]);

		len += hdr_len[1];
@@ -2196,6 +2188,7 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, 
		memcpy(hdr_data + len, hdr, hdr_len[2]);

		len += hdr_len[2];

	}



	return len;

}