Merge tag 'v6.10-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-block.git] / crypto / akcipher.c

diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index 52813f0b19e4e915bf7c53e178e97833caee72f0..e0ff5f4dda6d62c40d6478b5c727713d1d8ebc6a 100644 (file)
--- a/crypto/akcipher.c
+++ b/crypto/akcipher.c
@@ -70,30 +70,6 @@ static void crypto_akcipher_free_instance(struct crypto_instance *inst)
        akcipher->free(akcipher);
 }
 
-static int __maybe_unused crypto_akcipher_report_stat(
-       struct sk_buff *skb, struct crypto_alg *alg)
-{
-       struct akcipher_alg *akcipher = __crypto_akcipher_alg(alg);
-       struct crypto_istat_akcipher *istat;
-       struct crypto_stat_akcipher rakcipher;
-
-       istat = akcipher_get_stat(akcipher);
-
-       memset(&rakcipher, 0, sizeof(rakcipher));
-
-       strscpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
-       rakcipher.stat_encrypt_cnt = atomic64_read(&istat->encrypt_cnt);
-       rakcipher.stat_encrypt_tlen = atomic64_read(&istat->encrypt_tlen);
-       rakcipher.stat_decrypt_cnt = atomic64_read(&istat->decrypt_cnt);
-       rakcipher.stat_decrypt_tlen = atomic64_read(&istat->decrypt_tlen);
-       rakcipher.stat_sign_cnt = atomic64_read(&istat->sign_cnt);
-       rakcipher.stat_verify_cnt = atomic64_read(&istat->verify_cnt);
-       rakcipher.stat_err_cnt = atomic64_read(&istat->err_cnt);
-
-       return nla_put(skb, CRYPTOCFGA_STAT_AKCIPHER,
-                      sizeof(rakcipher), &rakcipher);
-}
-
 static const struct crypto_type crypto_akcipher_type = {
        .extsize = crypto_alg_extsize,
        .init_tfm = crypto_akcipher_init_tfm,
@@ -103,9 +79,6 @@ static const struct crypto_type crypto_akcipher_type = {
 #endif
 #if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_akcipher_report,
-#endif
-#ifdef CONFIG_CRYPTO_STATS
-       .report_stat = crypto_akcipher_report_stat,
 #endif
        .maskclear = ~CRYPTO_ALG_TYPE_MASK,
        .maskset = CRYPTO_ALG_TYPE_AHASH_MASK,
@@ -131,15 +104,11 @@ EXPORT_SYMBOL_GPL(crypto_alloc_akcipher);
 
 static void akcipher_prepare_alg(struct akcipher_alg *alg)
 {
-       struct crypto_istat_akcipher *istat = akcipher_get_stat(alg);
        struct crypto_alg *base = &alg->base;
 
        base->cra_type = &crypto_akcipher_type;
        base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
        base->cra_flags |= CRYPTO_ALG_TYPE_AKCIPHER;
-
-       if (IS_ENABLED(CONFIG_CRYPTO_STATS))
-               memset(istat, 0, sizeof(*istat));
 }
 
 static int akcipher_default_op(struct akcipher_request *req)