From cec950a18a5fb5d724b5f8a7d3908e671ed08d9d Mon Sep 17 00:00:00 2001 From: tobhe Date: Thu, 21 Oct 2021 23:03:48 +0000 Subject: [PATCH] Remove more dead code related to crypto task queues. --- sys/crypto/crypto.c | 10 +--------- sys/crypto/cryptodev.h | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/crypto/crypto.c b/sys/crypto/crypto.c index 3ea4ae48b33..c4bc6064a9b 100644 --- a/sys/crypto/crypto.c +++ b/sys/crypto/crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.c,v 1.88 2021/10/21 22:59:08 tobhe Exp $ */ +/* $OpenBSD: crypto.c,v 1.89 2021/10/21 23:03:48 tobhe Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -40,11 +40,6 @@ int crypto_drivers_num = 0; /* [A] attached drivers array size */ struct pool cryptop_pool; /* [I] set of crypto descriptors */ -struct taskq *crypto_taskq; /* [I] run crypto_invoke() and callback - with kernel lock */ -struct taskq *crypto_taskq_mpsafe; /* [I] run crypto_invoke() - without kernel lock */ - /* * Create a new session. */ @@ -520,9 +515,6 @@ crypto_getreq(int num) void crypto_init(void) { - crypto_taskq = taskq_create("crypto", 1, IPL_VM, 0); - crypto_taskq_mpsafe = taskq_create("crynlk", 1, IPL_VM, TASKQ_MPSAFE); - pool_init(&cryptop_pool, sizeof(struct cryptop), 0, IPL_VM, 0, "cryptop", NULL); } diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h index 020ca4a6840..4b56e0b6732 100644 --- a/sys/crypto/cryptodev.h +++ b/sys/crypto/cryptodev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.h,v 1.77 2021/10/21 22:59:08 tobhe Exp $ */ +/* $OpenBSD: cryptodev.h,v 1.78 2021/10/21 23:03:48 tobhe Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -150,8 +150,6 @@ struct cryptodesc { /* Structure describing complete operation */ struct cryptop { - struct task crp_task; - u_int64_t crp_sid; /* Session ID */ int crp_ilen; /* Input data total length */ int crp_olen; /* Result total length */ -- 2.20.1