Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index feb77e4..f149b1c 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -820,7 +820,7 @@ out:
 }
 EXPORT_SYMBOL_GPL(crypto_enqueue_request);
 
 }
 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;
 
 {
        struct list_head *request;
 


@@ -835,7 +835,14 @@ struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
        request = queue->list.next;
        list_del(request);
 
        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);
 
 }
 EXPORT_SYMBOL_GPL(crypto_dequeue_request);