git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/oss' into for-linus
[pandora-kernel.git]
/
include
/
crypto
/
internal
/
skcipher.h
diff --git
a/include/crypto/internal/skcipher.h
b/include/crypto/internal/skcipher.h
index
2ba42cd
..
3a748a6
100644
(file)
--- a/
include/crypto/internal/skcipher.h
+++ b/
include/crypto/internal/skcipher.h
@@
-79,8
+79,8
@@
static inline int skcipher_enqueue_givcrypt(
static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt(
struct crypto_queue *queue)
{
static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt(
struct crypto_queue *queue)
{
- return
container_of(ablkcipher_dequeue_request(queue),
-
struct skcipher_givcrypt_request, creq
);
+ return
__crypto_dequeue_request(
+
queue, offsetof(struct skcipher_givcrypt_request, creq.base)
);
}
static inline void *skcipher_givcrypt_reqctx(
}
static inline void *skcipher_givcrypt_reqctx(