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

net: igc: use skb_csum_is_sctp instead of protocol check

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

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



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

Using skb_csum_is_sctp is a easier way to validate it's a SCTP CRC
checksum offload packet, and yet it also makes igc 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 3b63ad2b

drivers/net/ethernet/intel/igc/igc_main.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -948,15 +948,6 @@ static void igc_tx_ctxtdesc(struct igc_ring *tx_ring,
		}
		}

		static inline bool igc_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 igc_tx_csum(struct igc_ring tx_ring, struct igc_tx_buffer first)
		{
		struct sk_buff *skb = first->skb;
		@@ -979,10 +970,7 @@ static void igc_tx_csum(struct igc_ring tx_ring, struct igc_tx_buffer first)
		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) &&
		igc_ipv6_csum_is_sctp(skb))) {
		if (skb_csum_is_sctp(skb)) {
		type_tucmd = IGC_ADVTXD_TUCMD_L4T_SCTP;
		break;
		}