Commit a1b30f7f authored Jul 16, 2021 by Xin Long Committed by Zheng Zengkai Jul 17, 2021

net: ixgbe: use skb_csum_is_sctp instead of protocol check

mainline inclusion
from mainline-v5.12-rc1-dontuse
commit f8c4b01d
category: feature
bugzilla: 173966
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f8c4b01d3a680de2144dd274df03ffaf69cfb881



----------------------------------------------------------------------

Using skb_csum_is_sctp is a easier way to validate it's a SCTP CRC
checksum offload packet, and yet it also makes ixgbe support SCTP
CRC checksum offload for UDP and GRE encapped packets, just as it
does in igb driver.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 0c2bf98c

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -8040,15 +8040,6 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
		return 1;
		}

		static inline bool ixgbe_ipv6_csum_is_sctp(struct sk_buff *skb)
		{
		unsigned int offset = 0;

		ipv6_find_hdr(skb, &offset, IPPROTO_SCTP, NULL, NULL);

		return offset == skb_checksum_start_offset(skb);
		}

		static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
		struct ixgbe_tx_buffer *first,
		struct ixgbe_ipsec_tx_data *itd)
		@@ -8074,10 +8065,7 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
		break;
		case offsetof(struct sctphdr, checksum):
		/* validate that this is actually an SCTP request */
		if (((first->protocol == htons(ETH_P_IP)) &&
		(ip_hdr(skb)->protocol == IPPROTO_SCTP)) \|\|
		((first->protocol == htons(ETH_P_IPV6)) &&
		ixgbe_ipv6_csum_is_sctp(skb))) {
		if (skb_csum_is_sctp(skb)) {
		type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_SCTP;
		break;
		}