summaryrefslogtreecommitdiff
path: root/crypto/algif_skcipher.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-09 07:00:30 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-09 07:01:38 +0300
commit237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch)
tree0cbd9882d28f19875f5c1daf1698edaac985de0f /crypto/algif_skcipher.c
parent7abccdba25be45630eede85053496f1f48d36ec8 (diff)
parente2e40f2c1ed433c5e224525c8c862fd32e5d3df2 (diff)
downloadlinux-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.xz
Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto - that one had evaded aio_complete() removal. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'crypto/algif_skcipher.c')
-rw-r--r--crypto/algif_skcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 0aa02635ceda..8f903b6df299 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -106,7 +106,7 @@ static void skcipher_async_cb(struct crypto_async_request *req, int err)
atomic_dec(&ctx->inflight);
skcipher_free_async_sgls(sreq);
kfree(req);
- aio_complete(iocb, err, err);
+ iocb->ki_complete(iocb, err, err);
}
static inline int skcipher_sndbuf(struct sock *sk)