diff options
| author | David S. Miller <davem@davemloft.net> | 2019-05-02 22:14:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-02 22:14:21 -0400 |
| commit | 1f176d519b43e6645b22f430ce16328dd6de88dc (patch) | |
| tree | a99d1d87937587c34502557d3790d060be6b92bc /crypto/xts.c | |
| parent | 3f19f5cdb50b52d715a230e7f31e60b554bb24cc (diff) | |
| parent | c7abed54533a04862f5f8ca24be5ad15b4e52456 (diff) | |
| download | linux-crypto-1f176d519b43e6645b22f430ce16328dd6de88dc.tar.gz linux-crypto-1f176d519b43e6645b22f430ce16328dd6de88dc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/xts.c')
| -rw-r--r-- | crypto/xts.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/xts.c b/crypto/xts.c index 847f54f7..2f948328 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -137,8 +137,12 @@ static void crypt_done(struct crypto_async_request *areq, int err) { struct skcipher_request *req = areq->data; - if (!err) + if (!err) { + struct rctx *rctx = skcipher_request_ctx(req); + + rctx->subreq.base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; err = xor_tweak_post(req); + } skcipher_request_complete(req, err); } |