Commit c64e6570 authored by Eric Biggers's avatar Eric Biggers
Browse files

lib/crc32: rename __crc32c_le_combine() to crc32c_combine() 



Since the Castagnoli CRC32 is now always just crc32c(), rename
__crc32c_le_combine() and __crc32c_le_shift() accordingly.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250208024911.14936-6-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 8df36829

drivers/infiniband/sw/siw/siw.h

+2 −2
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static inline __wsum siw_csum_update(const void *buff, int len, __wsum sum) 
static inline __wsum siw_csum_combine(__wsum csum, __wsum csum2, int offset,

				      int len)

{

	return (__force __wsum)__crc32c_le_combine((__force __u32)csum,

	return (__force __wsum)crc32c_combine((__force __u32)csum,

					      (__force __u32)csum2, len);

}

include/linux/crc32.h

+13 −15
Original line number Diff line number Diff line
@@ -76,29 +76,27 @@ static inline u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2) 
	return crc32_le_shift(crc1, len2) ^ crc2;

}



u32 crc32c_shift(u32 crc, size_t len);



/**

 * __crc32c_le_combine - Combine two crc32c check values into one. For two

 * 			 sequences of bytes, seq1 and seq2 with lengths len1

 * 			 and len2, __crc32c_le() check values were calculated

 * 			 for each, crc1 and crc2.

 * crc32c_combine - Combine two crc32c check values into one. For two sequences

 *		    of bytes, seq1 and seq2 with lengths len1 and len2, crc32c()

 *		    check values were calculated for each, crc1 and crc2.

 *

 * @crc1: crc32c of the first block

 * @crc2: crc32c of the second block

 * @len2: length of the second block

 *

 * Return: The __crc32c_le() check value of seq1 and seq2 concatenated,

 * 	   requiring only crc1, crc2, and len2. Note: If seq_full denotes

 * 	   the concatenated memory area of seq1 with seq2, and crc_full

 * 	   the __crc32c_le() value of seq_full, then crc_full ==

 * 	   __crc32c_le_combine(crc1, crc2, len2) when crc_full was

 * 	   seeded with the same initializer as crc1, and crc2 seed

 * 	   was 0. See also crc32c_combine_test().

 * Return: The crc32c() check value of seq1 and seq2 concatenated, requiring

 *	   only crc1, crc2, and len2. Note: If seq_full denotes the concatenated

 *	   memory area of seq1 with seq2, and crc_full the crc32c() value of

 *	   seq_full, then crc_full == crc32c_combine(crc1, crc2, len2) when

 *	   crc_full was seeded with the same initializer as crc1, and crc2 seed

 *	   was 0. See also crc_combine_test().

 */

u32 __crc32c_le_shift(u32 crc, size_t len);



static inline u32 __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2)

static inline u32 crc32c_combine(u32 crc1, u32 crc2, size_t len2)

{

	return __crc32c_le_shift(crc1, len2) ^ crc2;

	return crc32c_shift(crc1, len2) ^ crc2;

}



#define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)(data), length)

include/net/sctp/checksum.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static inline __wsum sctp_csum_update(const void *buff, int len, __wsum sum) 
static inline __wsum sctp_csum_combine(__wsum csum, __wsum csum2,

				       int offset, int len)

{

	return (__force __wsum)__crc32c_le_combine((__force __u32)csum,

	return (__force __wsum)crc32c_combine((__force __u32)csum,

					      (__force __u32)csum2, len);

}

lib/crc32.c

+3 −3
Original line number Diff line number Diff line
@@ -117,13 +117,13 @@ u32 crc32_le_shift(u32 crc, size_t len) 
{

	return crc32_generic_shift(crc, len, CRC32_POLY_LE);

}

EXPORT_SYMBOL(crc32_le_shift);



u32 __crc32c_le_shift(u32 crc, size_t len)

u32 crc32c_shift(u32 crc, size_t len)

{

	return crc32_generic_shift(crc, len, CRC32C_POLY_LE);

}

EXPORT_SYMBOL(crc32_le_shift);

EXPORT_SYMBOL(__crc32c_le_shift);

EXPORT_SYMBOL(crc32c_shift);



u32 crc32_be_base(u32 crc, const u8 *p, size_t len)

{

lib/crc_kunit.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static u64 crc32c_wrapper(u64 crc, const u8 *p, size_t len) 


static u64 crc32c_combine_wrapper(u64 crc1, u64 crc2, size_t len2)

{

	return __crc32c_le_combine(crc1, crc2, len2);

	return crc32c_combine(crc1, crc2, len2);

}



static const struct crc_variant crc_variant_crc32c = {