diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-03-07 13:57:24 +0100 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-03-07 13:57:24 +0100 |
commit | 249b6bae56fc18f4512fe5bc085f71cc235c0735 (patch) | |
tree | 89cf28b0e13c85f0a04d216121cbdafdf9668ba0 /crypto/crc32c_generic.c | |
parent | 59d9ddb192bc424cc53e52180478001af4fb99a4 (diff) | |
parent | c7ee969dff58a7f5e447e27fe064e2d1ce81d574 (diff) | |
download | linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.tar.gz linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.zip |
Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.16-rc4
Diffstat (limited to '')
-rw-r--r-- | crypto/crc32c_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c index 4c0a0e27..37232039 100644 --- a/crypto/crc32c_generic.c +++ b/crypto/crc32c_generic.c @@ -146,6 +146,7 @@ static struct shash_alg alg = { .cra_name = "crc32c", .cra_driver_name = "crc32c-generic", .cra_priority = 100, + .cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_alignmask = 3, .cra_ctxsize = sizeof(struct chksum_ctx), |