From: Larry Finger Date: Thu, 14 Jul 2011 23:33:33 +0000 (-0500) Subject: staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=76de64db13d0f05401d984bce45dbcf9a805cd84;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC Signed-off-by: Larry Finger --- diff --git a/drivers/staging/rtl8192e/internal.h b/drivers/staging/rtl8192e/internal.h index 00139c271e07..dab7aa263191 100644 --- a/drivers/staging/rtl8192e/internal.h +++ b/drivers/staging/rtl8192e/internal.h @@ -63,10 +63,6 @@ static inline struct crypto_alg *crypto_alg_mod_lookup(const char *name) } #endif -#ifdef CONFIG_CRYPTO_HMAC -int crypto_alloc_hmac_block(struct crypto_tfm *tfm); -void crypto_free_hmac_block(struct crypto_tfm *tfm); -#else static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm) { return 0; @@ -74,7 +70,6 @@ static inline int crypto_alloc_hmac_block(struct crypto_tfm *tfm) static inline void crypto_free_hmac_block(struct crypto_tfm *tfm) { } -#endif #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); diff --git a/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl_crypto.h index a8df4101bf2d..7b4551db961d 100644 --- a/drivers/staging/rtl8192e/rtl_crypto.h +++ b/drivers/staging/rtl8192e/rtl_crypto.h @@ -168,9 +168,6 @@ struct digest_tfm { unsigned int nsg, u8 *out); int (*dit_setkey)(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); -#ifdef CONFIG_CRYPTO_HMAC - void *dit_hmac_block; -#endif }; struct compress_tfm { @@ -382,17 +379,4 @@ static inline int crypto_comp_decompress(struct crypto_tfm *tfm, return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen); } -/* - * HMAC support. - */ -#ifdef CONFIG_CRYPTO_HMAC -void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen); -void crypto_hmac_update(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg); -void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key, - unsigned int *keylen, u8 *out); -void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen, - struct scatterlist *sg, unsigned int nsg, u8 *out); -#endif /* CONFIG_CRYPTO_HMAC */ - #endif /* _LINUX_CRYPTO_H */