Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c58ac0 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: crc32 - Rename generic implementation 



The generic crc32 implementation is currently called crc32.  This
is a problem because it clashes with the lib implementation of crc32.

This patch renames the crypto crc32 to crc32_generic so that it is
consistent with crc32c.  An alias for the driver is also added.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ddef4824

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o 
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o

obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o

obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o

obj-$(CONFIG_CRYPTO_CRC32) += crc32.o

obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o

obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_common.o crct10dif_generic.o

obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o

obj-$(CONFIG_CRYPTO_LZO) += lzo.o

crypto/crc32.c→crypto/crc32_generic.c

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct shash_alg alg = { 
	.digestsize	= CHKSUM_DIGEST_SIZE,

	.base		= {

		.cra_name		= "crc32",

		.cra_driver_name	= "crc32-table",

		.cra_driver_name	= "crc32-generic",

		.cra_priority		= 100,

		.cra_blocksize		= CHKSUM_BLOCK_SIZE,

		.cra_ctxsize		= sizeof(u32),
@@ -157,3 +157,4 @@ MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>"); 
MODULE_DESCRIPTION("CRC32 calculations wrapper for lib/crc32");

MODULE_LICENSE("GPL");

MODULE_ALIAS_CRYPTO("crc32");

MODULE_ALIAS_CRYPTO("crc32-generic");