diff options
author | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
commit | 4c2d6cb3bde307e7db8e95181cb66cf72ea5f253 (patch) | |
tree | 751bd51f7ec26e0d752c1a974c3d6c9bfc0604cb /crypto/tcrypt.c | |
parent | 60c61f0d0919094cede7f96cf52cc79829b82e02 (diff) | |
parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
download | linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.tar.gz linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.zip |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to '')
-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; |