diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
| commit | 0d6e29d8da85e74c1b37801469be3974fd706ba7 (patch) | |
| tree | 0a5824f6fef63ea2be36406768e8cfe3e6c2457e /crypto/tcrypt.c | |
| parent | 2db18d12ffa4131d398564bfc0fb15f26cdf52e5 (diff) | |
| parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
| download | linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.tar.gz linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.zip | |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 46a4a757..270bc4b8 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1789,7 +1789,7 @@ static int do_test(const char *alg, u32 type, u32 mask, int m) test_aead_speed("rfc4106(gcm(aes))", ENCRYPT, sec, NULL, 0, 16, 16, aead_speed_template_20); test_aead_speed("gcm(aes)", ENCRYPT, sec, - NULL, 0, 16, 8, aead_speed_template_20); + NULL, 0, 16, 8, speed_template_16_24_32); break; case 212: |