From cec9ed7cf59fe6dafcec0a30811024d22fad8cbd Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Thu, 17 Feb 2022 16:43:55 +0100 Subject: [PATCH] net: Use csum_replace_... and csum_sub() helpers instead of opencoding In a couple places, open coded calculation can be avoided and replaced by the equivalent csum_replace4() and csum_replace_by_diff(). There's also one place where csum_sub() should be used instead of csum_add(). Signed-off-by: Christophe Leroy --- net/core/utils.c | 4 ++-- net/netfilter/nft_payload.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/utils.c b/net/core/utils.c index 1f31a39236d52f..938495bc1d348b 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -476,9 +476,9 @@ void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb, __wsum diff, bool pseudohdr) { if (skb->ip_summed != CHECKSUM_PARTIAL) { - *sum = csum_fold(csum_add(diff, ~csum_unfold(*sum))); + csum_replace_by_diff(sum, diff); if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr) - skb->csum = ~csum_add(diff, ~skb->csum); + skb->csum = ~csum_sub(diff, skb->csum); } else if (pseudohdr) { *sum = ~csum_fold(csum_add(diff, csum_unfold(*sum))); } diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index 5cc06aef43452a..b6cfd0759bc562 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -557,7 +557,7 @@ const struct nft_expr_ops nft_payload_fast_ops = { static inline void nft_csum_replace(__sum16 *sum, __wsum fsum, __wsum tsum) { - *sum = csum_fold(csum_add(csum_sub(~csum_unfold(*sum), fsum), tsum)); + csum_replace4(sum, fsum, tsum); if (*sum == 0) *sum = CSUM_MANGLED_0; }