Commit 607f00b3 authored by Xin Long's avatar Xin Long Committed by Zheng Zengkai
Browse files

net: add inline function skb_csum_is_sctp 

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

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



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

This patch is to define a inline function skb_csum_is_sctp(), and
also replace all places where it checks if it's a SCTP CSUM skb.
This function would be used later in many networking drivers in
the following patches.

Suggested-by: default avatarAlexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reviewed-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarYongxin Li <liyongxin1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 56e6a9a1

drivers/net/ethernet/pensando/ionic/ionic_txrx.c

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static int ionic_tx_calc_csum(struct ionic_queue *q, struct sk_buff *skb) 
		stats->vlan_inserted++;

	}



	if (skb->csum_not_inet)

	if (skb_csum_is_sctp(skb))

		stats->crc32_csum++;

	else

		stats->csum++;

include/linux/skbuff.h

+5 −0
Original line number Diff line number Diff line
@@ -4621,5 +4621,10 @@ static inline void skb_reset_redirect(struct sk_buff *skb) 
#endif

}



static inline bool skb_csum_is_sctp(struct sk_buff *skb)

{

	return skb->csum_not_inet;

}



#endif	/* __KERNEL__ */

#endif	/* _LINUX_SKBUFF_H */

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -3619,7 +3619,7 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, 
int skb_csum_hwoffload_help(struct sk_buff *skb,

			    const netdev_features_t features)

{

	if (unlikely(skb->csum_not_inet))

	if (unlikely(skb_csum_is_sctp(skb)))

		return !!(features & NETIF_F_SCTP_CRC) ? 0 :

			skb_crc32c_csum_help(skb);