diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:51:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 14:51:45 -0700 |
commit | 088e5d55cfb0cb02bc0528777f3a69f70793a264 (patch) | |
tree | 2229ca458a151adb22cf235eaaf4a35dad35e77b /crypto/algapi.c | |
parent | f7699b31f9d4e64946e52c56ef61b9faef940013 (diff) | |
parent | c88da77c3d601b6ee28cdd5204acbc6ebdf5b182 (diff) | |
download | linux-crypto-088e5d55cfb0cb02bc0528777f3a69f70793a264.tar.gz linux-crypto-088e5d55cfb0cb02bc0528777f3a69f70793a264.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: skcipher - Fix skcipher_dequeue_givcrypt NULL test
Diffstat (limited to 'crypto/algapi.c')
-rw-r--r-- | crypto/algapi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index 56c62e28..df0863d5 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -692,7 +692,7 @@ out: } EXPORT_SYMBOL_GPL(crypto_enqueue_request); -struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) +void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset) { struct list_head *request; @@ -707,7 +707,14 @@ struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) request = queue->list.next; list_del(request); - return list_entry(request, struct crypto_async_request, list); + return (char *)list_entry(request, struct crypto_async_request, list) - + offset; +} +EXPORT_SYMBOL_GPL(__crypto_dequeue_request); + +struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue) +{ + return __crypto_dequeue_request(queue, 0); } EXPORT_SYMBOL_GPL(crypto_dequeue_request); |