diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/algapi.h | 14 | ||||
-rw-r--r-- | include/linux/crypto.h | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index 290bce0c5bd5..cd721a7ce78f 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h | |||
@@ -234,16 +234,16 @@ static inline struct crypto_async_request *crypto_get_backlog( | |||
234 | container_of(queue->backlog, struct crypto_async_request, list); | 234 | container_of(queue->backlog, struct crypto_async_request, list); |
235 | } | 235 | } |
236 | 236 | ||
237 | static inline int ablkcipher_enqueue_request(struct ablkcipher_alg *alg, | 237 | static inline int ablkcipher_enqueue_request(struct crypto_queue *queue, |
238 | struct ablkcipher_request *request) | 238 | struct ablkcipher_request *request) |
239 | { | 239 | { |
240 | return crypto_enqueue_request(alg->queue, &request->base); | 240 | return crypto_enqueue_request(queue, &request->base); |
241 | } | 241 | } |
242 | 242 | ||
243 | static inline struct ablkcipher_request *ablkcipher_dequeue_request( | 243 | static inline struct ablkcipher_request *ablkcipher_dequeue_request( |
244 | struct ablkcipher_alg *alg) | 244 | struct crypto_queue *queue) |
245 | { | 245 | { |
246 | return ablkcipher_request_cast(crypto_dequeue_request(alg->queue)); | 246 | return ablkcipher_request_cast(crypto_dequeue_request(queue)); |
247 | } | 247 | } |
248 | 248 | ||
249 | static inline void *ablkcipher_request_ctx(struct ablkcipher_request *req) | 249 | static inline void *ablkcipher_request_ctx(struct ablkcipher_request *req) |
@@ -251,10 +251,10 @@ static inline void *ablkcipher_request_ctx(struct ablkcipher_request *req) | |||
251 | return req->__ctx; | 251 | return req->__ctx; |
252 | } | 252 | } |
253 | 253 | ||
254 | static inline int ablkcipher_tfm_in_queue(struct crypto_ablkcipher *tfm) | 254 | static inline int ablkcipher_tfm_in_queue(struct crypto_queue *queue, |
255 | struct crypto_ablkcipher *tfm) | ||
255 | { | 256 | { |
256 | return crypto_tfm_in_queue(crypto_ablkcipher_alg(tfm)->queue, | 257 | return crypto_tfm_in_queue(queue, crypto_ablkcipher_tfm(tfm)); |
257 | crypto_ablkcipher_tfm(tfm)); | ||
258 | } | 258 | } |
259 | 259 | ||
260 | #endif /* _CRYPTO_ALGAPI_H */ | 260 | #endif /* _CRYPTO_ALGAPI_H */ |
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index da09b4ac3ae9..b1c7f4187c5b 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -95,7 +95,6 @@ struct crypto_async_request; | |||
95 | struct crypto_aead; | 95 | struct crypto_aead; |
96 | struct crypto_blkcipher; | 96 | struct crypto_blkcipher; |
97 | struct crypto_hash; | 97 | struct crypto_hash; |
98 | struct crypto_queue; | ||
99 | struct crypto_tfm; | 98 | struct crypto_tfm; |
100 | struct crypto_type; | 99 | struct crypto_type; |
101 | 100 | ||
@@ -178,8 +177,6 @@ struct ablkcipher_alg { | |||
178 | int (*encrypt)(struct ablkcipher_request *req); | 177 | int (*encrypt)(struct ablkcipher_request *req); |
179 | int (*decrypt)(struct ablkcipher_request *req); | 178 | int (*decrypt)(struct ablkcipher_request *req); |
180 | 179 | ||
181 | struct crypto_queue *queue; | ||
182 | |||
183 | unsigned int min_keysize; | 180 | unsigned int min_keysize; |
184 | unsigned int max_keysize; | 181 | unsigned int max_keysize; |
185 | unsigned int ivsize; | 182 | unsigned int ivsize; |