diff options
author | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
commit | 45ce5d915020b8c76238e123748e0eb6e9ddd6ad (patch) | |
tree | 916682ca7617ad686d2f8f9cac41ec4e9c432b00 /crypto/crc32_generic.c | |
parent | 4a06f454768a7e11e8f10b900b450786546cbba1 (diff) | |
parent | 17a3638239bb39acce5f03e779c69bc0e4a5c736 (diff) | |
download | linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.tar.gz linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.zip |
Merge tag 'v4.16-rc2' into next-general
Sync to Linux 4.16-rc2 for developers to work against.
Diffstat (limited to 'crypto/crc32_generic.c')
-rw-r--r-- | crypto/crc32_generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crc32_generic.c b/crypto/crc32_generic.c index aa2a25fc..718cbce8 100644 --- a/crypto/crc32_generic.c +++ b/crypto/crc32_generic.c @@ -133,6 +133,7 @@ static struct shash_alg alg = { .cra_name = "crc32", .cra_driver_name = "crc32-generic", .cra_priority = 100, + .cra_flags = CRYPTO_ALG_OPTIONAL_KEY, .cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_ctxsize = sizeof(u32), .cra_module = THIS_MODULE, |