Module Name: src
Committed By: riastradh
Date: Sun May 22 11:30:05 UTC 2022
Modified Files:
src/sys/opencrypto: crypto.c cryptodev.h
Log Message:
opencrypto: Nix CRYPTO_F_DONE.
Nothing uses it any more.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/opencrypto/crypto.c
cvs rdiff -u -r1.44 -r1.45 src/sys/opencrypto/cryptodev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.120 src/sys/opencrypto/crypto.c:1.121
--- src/sys/opencrypto/crypto.c:1.120 Sun May 22 11:25:14 2022
+++ src/sys/opencrypto/crypto.c Sun May 22 11:30:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.120 2022/05/22 11:25:14 riastradh Exp $ */
+/* $NetBSD: crypto.c,v 1.121 2022/05/22 11:30:05 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.120 2022/05/22 11:25:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.121 2022/05/22 11:30:05 riastradh Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -1748,8 +1748,6 @@ crypto_done(struct cryptop *crp)
#endif
DPRINTF("lid[%u]: crp %p\n", CRYPTO_SESID2LID(crp->crp_sid), crp);
- crp->crp_flags |= CRYPTO_F_DONE;
-
qs = crypto_get_crp_ret_qs(crp->reqcpu);
crp_ret_q = &qs->crp_ret_q;
wasempty = TAILQ_EMPTY(crp_ret_q);
@@ -1780,8 +1778,6 @@ crypto_kdone(struct cryptkop *krp)
if (krp->krp_status != 0)
cryptostats.cs_kerrs++;
- krp->krp_flags |= CRYPTO_F_DONE;
-
qs = crypto_get_crp_ret_qs(krp->reqcpu);
crp_ret_kq = &qs->crp_ret_kq;
Index: src/sys/opencrypto/cryptodev.h
diff -u src/sys/opencrypto/cryptodev.h:1.44 src/sys/opencrypto/cryptodev.h:1.45
--- src/sys/opencrypto/cryptodev.h:1.44 Sun May 22 11:25:14 2022
+++ src/sys/opencrypto/cryptodev.h Sun May 22 11:30:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.h,v 1.44 2022/05/22 11:25:14 riastradh Exp $ */
+/* $NetBSD: cryptodev.h,v 1.45 2022/05/22 11:30:05 riastradh Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -470,10 +470,10 @@ struct cryptop {
#define CRYPTO_F_REL 0x0004 /* Must return data in same place */
#define CRYPTO_F_BATCH 0x0008 /* Batch op if possible possible */
#define CRYPTO_F_UNUSED0 0x0010 /* was CRYPTO_F_CBIMM */
-#define CRYPTO_F_DONE 0x0020 /* Operation completed */
-#define CRYPTO_F_UNUSED1 0x0040 /* was CRYPTO_F_CBIFSYNC */
+#define CRYPTO_F_UNUSED1 0x0020 /* was CRYPTO_F_DONE */
+#define CRYPTO_F_UNUSED2 0x0040 /* was CRYPTO_F_CBIFSYNC */
#define CRYPTO_F_ONRETQ 0x0080 /* Request is on return queue */
-#define CRYPTO_F_UNUSED2 0x0100 /* was CRYPTO_F_USER */
+#define CRYPTO_F_UNUSED3 0x0100 /* was CRYPTO_F_USER */
#define CRYPTO_F_MORE 0x0200 /* more data to follow */
int crp_devflags; /* other than cryptodev.c must not use. */
