forked from luck/tmp_suning_uos_patched
lib/crc: Use consistent naming for CRC-32 polynomials
Header was defining CRCPOLY_LE/BE and CRC32C_POLY_LE but in fact all of them are CRC-32 polynomials so use consistent naming. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
1fb2e3f276
commit
e37f2f93af
|
@ -7,8 +7,8 @@
|
|||
* *the* standard CRC-32 polynomial, first popularized by Ethernet.
|
||||
* x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x^1+x^0
|
||||
*/
|
||||
#define CRCPOLY_LE 0xedb88320
|
||||
#define CRCPOLY_BE 0x04c11db7
|
||||
#define CRC32_POLY_LE 0xedb88320
|
||||
#define CRC32_POLY_BE 0x04c11db7
|
||||
|
||||
/*
|
||||
* This is the CRC32c polynomial, as outlined by Castagnoli.
|
||||
|
|
10
lib/crc32.c
10
lib/crc32.c
|
@ -185,7 +185,7 @@ static inline u32 __pure crc32_le_generic(u32 crc, unsigned char const *p,
|
|||
#if CRC_LE_BITS == 1
|
||||
u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
return crc32_le_generic(crc, p, len, NULL, CRCPOLY_LE);
|
||||
return crc32_le_generic(crc, p, len, NULL, CRC32_POLY_LE);
|
||||
}
|
||||
u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
|
@ -195,7 +195,7 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
|
|||
u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
return crc32_le_generic(crc, p, len,
|
||||
(const u32 (*)[256])crc32table_le, CRCPOLY_LE);
|
||||
(const u32 (*)[256])crc32table_le, CRC32_POLY_LE);
|
||||
}
|
||||
u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
|
@ -269,7 +269,7 @@ static u32 __attribute_const__ crc32_generic_shift(u32 crc, size_t len,
|
|||
|
||||
u32 __attribute_const__ crc32_le_shift(u32 crc, size_t len)
|
||||
{
|
||||
return crc32_generic_shift(crc, len, CRCPOLY_LE);
|
||||
return crc32_generic_shift(crc, len, CRC32_POLY_LE);
|
||||
}
|
||||
|
||||
u32 __attribute_const__ __crc32c_le_shift(u32 crc, size_t len)
|
||||
|
@ -331,13 +331,13 @@ static inline u32 __pure crc32_be_generic(u32 crc, unsigned char const *p,
|
|||
#if CRC_LE_BITS == 1
|
||||
u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
return crc32_be_generic(crc, p, len, NULL, CRCPOLY_BE);
|
||||
return crc32_be_generic(crc, p, len, NULL, CRC32_POLY_BE);
|
||||
}
|
||||
#else
|
||||
u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
|
||||
{
|
||||
return crc32_be_generic(crc, p, len,
|
||||
(const u32 (*)[256])crc32table_be, CRCPOLY_BE);
|
||||
(const u32 (*)[256])crc32table_be, CRC32_POLY_BE);
|
||||
}
|
||||
#endif
|
||||
EXPORT_SYMBOL(crc32_be);
|
||||
|
|
|
@ -58,7 +58,7 @@ static void crc32init_le_generic(const uint32_t polynomial,
|
|||
|
||||
static void crc32init_le(void)
|
||||
{
|
||||
crc32init_le_generic(CRCPOLY_LE, crc32table_le);
|
||||
crc32init_le_generic(CRC32_POLY_LE, crc32table_le);
|
||||
}
|
||||
|
||||
static void crc32cinit_le(void)
|
||||
|
@ -77,7 +77,7 @@ static void crc32init_be(void)
|
|||
crc32table_be[0][0] = 0;
|
||||
|
||||
for (i = 1; i < BE_TABLE_SIZE; i <<= 1) {
|
||||
crc = (crc << 1) ^ ((crc & 0x80000000) ? CRCPOLY_BE : 0);
|
||||
crc = (crc << 1) ^ ((crc & 0x80000000) ? CRC32_POLY_BE : 0);
|
||||
for (j = 0; j < i; j++)
|
||||
crc32table_be[0][i + j] = crc ^ crc32table_be[0][j];
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user