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 git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus
[pandora-kernel.git]
/
crypto
/
authenc.c
diff --git
a/crypto/authenc.c
b/crypto/authenc.c
index
ed8ac5a
..
4b22676
100644
(file)
--- a/
crypto/authenc.c
+++ b/
crypto/authenc.c
@@
-217,9
+217,10
@@
static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
int err)
{
if (!err) {
int err)
{
if (!err) {
- struct aead_givcrypt_request *greq = req->data;
+ struct aead_request *areq = req->data;
+ struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
- err = crypto_authenc_genicv(
&greq->
areq, greq->giv, 0);
+ err = crypto_authenc_genicv(areq, greq->giv, 0);
}
aead_request_complete(req->data, err);
}
aead_request_complete(req->data, err);