diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
| commit | 21e3a539957468d04a7d4f9461332d1199adec16 (patch) | |
| tree | 1862c879e19589359002e0622da83bc6152cbb9c /crypto/tcrypt.c | |
| parent | 796be36a9b84fab6b1a150399ec1f9b2267c0a7e (diff) | |
| parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
| download | linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.tar.gz linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'crypto/tcrypt.c')
| -rw-r--r-- | crypto/tcrypt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 25a5934f..66d254ce 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1174,10 +1174,6 @@ static int do_test(int m) ret += tcrypt_test("ghash"); break; - case 47: - ret += tcrypt_test("crct10dif"); - break; - case 100: ret += tcrypt_test("hmac(md5)"); break; @@ -1502,10 +1498,6 @@ static int do_test(int m) test_hash_speed("crc32c", sec, generic_hash_speed_template); if (mode > 300 && mode < 400) break; - case 320: - test_hash_speed("crct10dif", sec, generic_hash_speed_template); - if (mode > 300 && mode < 400) break; - case 399: break; |