diff options
author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
commit | 07d045372921bfaa843ea00749c150b099ca0a49 (patch) | |
tree | f849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/ctr.c | |
parent | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (diff) | |
parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
download | linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.tar.gz linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.zip |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'crypto/ctr.c')
-rw-r--r-- | crypto/ctr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ctr.c b/crypto/ctr.c index a9a7a44f..a4f4a898 100644 --- a/crypto/ctr.c +++ b/crypto/ctr.c @@ -209,7 +209,7 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb) inst->alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER; inst->alg.cra_priority = alg->cra_priority; inst->alg.cra_blocksize = 1; - inst->alg.cra_alignmask = alg->cra_alignmask | (__alignof__(u32) - 1); + inst->alg.cra_alignmask = alg->cra_alignmask; inst->alg.cra_type = &crypto_blkcipher_type; inst->alg.cra_blkcipher.ivsize = alg->cra_blocksize; |