aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-26 04:12:40 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2006-09-20 21:46:22 -0400
commite4d5b79c661c7cfca9d8d5afd040a295f128d3cb (patch)
tree55a19ceca1b51b26d1934d388b26f0b1bed99a3e /include
parentfce32d70ba834129b164c40c2d4260e5a7a7d850 (diff)
[CRYPTO] users: Use crypto_comp and crypto_has_*
This patch converts all users to use the new crypto_comp type and the crypto_has_* functions. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include')
-rw-r--r--include/linux/crypto.h5
-rw-r--r--include/net/ipcomp.h5
2 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index cf91c4c0638b..d4f9948b64b1 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -928,6 +928,11 @@ static inline int crypto_has_comp(const char *alg_name, u32 type, u32 mask)
928 return crypto_has_alg(alg_name, type, mask); 928 return crypto_has_alg(alg_name, type, mask);
929} 929}
930 930
931static inline const char *crypto_comp_name(struct crypto_comp *tfm)
932{
933 return crypto_tfm_alg_name(crypto_comp_tfm(tfm));
934}
935
931static inline struct compress_tfm *crypto_comp_crt(struct crypto_comp *tfm) 936static inline struct compress_tfm *crypto_comp_crt(struct crypto_comp *tfm)
932{ 937{
933 return &crypto_comp_tfm(tfm)->crt_compress; 938 return &crypto_comp_tfm(tfm)->crt_compress;
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index b94e3047b4d9..87c1af3e5e82 100644
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -1,15 +1,14 @@
1#ifndef _NET_IPCOMP_H 1#ifndef _NET_IPCOMP_H
2#define _NET_IPCOMP_H 2#define _NET_IPCOMP_H
3 3
4#include <linux/crypto.h>
4#include <linux/types.h> 5#include <linux/types.h>
5 6
6#define IPCOMP_SCRATCH_SIZE 65400 7#define IPCOMP_SCRATCH_SIZE 65400
7 8
8struct crypto_tfm;
9
10struct ipcomp_data { 9struct ipcomp_data {
11 u16 threshold; 10 u16 threshold;
12 struct crypto_tfm **tfms; 11 struct crypto_comp **tfms;
13}; 12};
14 13
15#endif 14#endif