diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
| commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
| tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/linux/crypto.h | |
| parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
| parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/linux/crypto.h')
| -rw-r--r-- | include/linux/crypto.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index e5e468e9133..8a94217b298 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -18,7 +18,6 @@ #define _LINUX_CRYPTO_H #include <linux/atomic.h> -#include <linux/module.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/slab.h> @@ -72,6 +71,11 @@ #define CRYPTO_ALG_TESTED 0x00000400 /* + * Set if the algorithm is an instance that is build from templates. + */ +#define CRYPTO_ALG_INSTANCE 0x00000800 + +/* * Transform masks and values (for crt_flags). */ #define CRYPTO_TFM_REQ_MASK 0x000fff00 @@ -505,11 +509,6 @@ static inline int crypto_tfm_alg_priority(struct crypto_tfm *tfm) return tfm->__crt_alg->cra_priority; } -static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm) -{ - return module_name(tfm->__crt_alg->cra_module); -} - static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm) { return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK; |