Module Name:    src
Committed By:   pgoyette
Date:           Sun Sep 23 01:33:26 UTC 2018

Modified Files:
        src/distrib/sets/lists/modules [pgoyette-compat]: mi
        src/sys/dev/raidframe [pgoyette-compat]: rf_compat50.c
        src/sys/modules [pgoyette-compat]: Makefile
        src/sys/modules/compat_50 [pgoyette-compat]: Makefile
        src/sys/modules/compat_netbsd32_16 [pgoyette-compat]: Makefile
        src/sys/modules/compat_raid_50 [pgoyette-compat]: Makefile
        src/sys/modules/crypto [pgoyette-compat]: Makefile
        src/sys/opencrypto [pgoyette-compat]: cryptodev.c files.opencrypto
            ocryptodev.c
        src/sys/sys [pgoyette-compat]: compat_stub.h
Added Files:
        src/sys/modules/compat_crypto_50 [pgoyette-compat]: Makefile

Log Message:
Split the compat_crypto_50 from the rest of the crypto module

Cleanup some stuff left over from similar changes to raid modules.


To generate a diff of this commit:
cvs rdiff -u -r1.114.2.22 -r1.114.2.23 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.202.2.35 -r1.202.2.36 src/sys/modules/Makefile
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/modules/compat_50/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_crypto_50/Makefile
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/modules/compat_netbsd32_16/Makefile
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/modules/compat_raid_50/Makefile
cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/modules/crypto/Makefile
cvs rdiff -u -r1.98.2.5 -r1.98.2.6 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.26.8.1 -r1.26.8.2 src/sys/opencrypto/files.opencrypto
cvs rdiff -u -r1.11.2.5 -r1.11.2.6 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/sys/sys/compat_stub.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.114.2.22 src/distrib/sets/lists/modules/mi:1.114.2.23
--- src/distrib/sets/lists/modules/mi:1.114.2.22	Sat Sep 22 22:21:46 2018
+++ src/distrib/sets/lists/modules/mi	Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114.2.22 2018/09/22 22:21:46 pgoyette Exp $
+# $NetBSD: mi,v 1.114.2.23 2018/09/23 01:33:25 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -118,6 +118,8 @@
 ./@MODULEDIR@/coredump/coredump.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/crypto				base-kernel-modules	kmod
 ./@MODULEDIR@/crypto/crypto.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/crypto_50				base-kernel-modules	kmod
+./@MODULEDIR@/crypto_50/crypto_50.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/cyclic				base-kernel-modules	kmod,dtrace
 ./@MODULEDIR@/cyclic/cyclic.kmod		base-kernel-modules	kmod,dtrace
 ./@MODULEDIR@/dbcool				base-kernel-modules	kmod

Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.3.2.4 src/sys/dev/raidframe/rf_compat50.c:1.3.2.5
--- src/sys/dev/raidframe/rf_compat50.c:1.3.2.4	Tue Sep 18 23:03:54 2018
+++ src/sys/dev/raidframe/rf_compat50.c	Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_compat50.c,v 1.3.2.4 2018/09/18 23:03:54 pgoyette Exp $	*/
+/*	$NetBSD: rf_compat50.c,v 1.3.2.5 2018/09/23 01:33:25 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/module.h>
 
 #include <sys/compat_stub.h>
 
@@ -255,3 +256,21 @@ raidframe_50_fini(void)
 
 	raidframe50_ioctl_hook_unset();
 }
+
+MODULE(MODULE_CLASS_EXEC, raid_50, "raid,compat_50");
+
+static int
+raid_50_modcmd(modcmd_t cmd, void *arg)
+{
+
+	switch (cmd) {
+	MODULE_CMD_INIT:
+		raidframe_50_init();
+		return 0;
+	MODULE_CMD_FINI:
+		raidframe_50_fini();
+		return 0;
+	default:
+		return ENOTTY;
+	}
+}

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.35 src/sys/modules/Makefile:1.202.2.36
--- src/sys/modules/Makefile:1.202.2.35	Sat Sep 22 22:21:46 2018
+++ src/sys/modules/Makefile	Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.202.2.35 2018/09/22 22:21:46 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.202.2.36 2018/09/23 01:33:25 pgoyette Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,8 @@ SUBDIR+=	compat_sysv_10 compat_sysv_14 c
 
 SUBDIR+=	compat_raid_80
 
+SUBDIR+=	compat_crypto_50
+
 SUBDIR+=	accf_dataready
 SUBDIR+=	accf_httpready
 SUBDIR+=	adosfs

Index: src/sys/modules/compat_50/Makefile
diff -u src/sys/modules/compat_50/Makefile:1.1.2.9 src/sys/modules/compat_50/Makefile:1.1.2.10
--- src/sys/modules/compat_50/Makefile:1.1.2.9	Wed Sep 19 04:12:43 2018
+++ src/sys/modules/compat_50/Makefile	Sun Sep 23 01:33:25 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.9 2018/09/19 04:12:43 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.10 2018/09/23 01:33:25 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -14,10 +14,6 @@ SRCS+=	vfs_syscalls_50.c uipc_syscalls_5
 SRCS+=	rndpseudo_50.c clockctl_50.c if_spppsubr50.c
 SRCS+=	rtsock_50.c
 
-.PATH:	${S}/opencrypto
-
-SRCS+=	ocryptodev.c
-
 .PATH:	${S}/dev/raidframe
 
 SRCS+=	rf_compat50.c

Index: src/sys/modules/compat_netbsd32_16/Makefile
diff -u src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.3 src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.4
--- src/sys/modules/compat_netbsd32_16/Makefile:1.1.2.3	Fri Sep 14 08:38:37 2018
+++ src/sys/modules/compat_netbsd32_16/Makefile	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.3 2018/09/14 08:38:37 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.4 2018/09/23 01:33:26 pgoyette Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -18,7 +18,7 @@ SRCS+=	netbsd32_compat_16.c
 SRCS+=  netbsd32_sigcode.S
 .endif
 
-.PATH:	${S}/${MACHINE_CPU}/${MACHINE_CPU}
+.PATH:	${S}/arch/${MACHINE}/${MACHINE}
 SRCS+=	netbsd32_machdep_16.c
 
 .include <bsd.kmodule.mk>

Index: src/sys/modules/compat_raid_50/Makefile
diff -u src/sys/modules/compat_raid_50/Makefile:1.1.2.1 src/sys/modules/compat_raid_50/Makefile:1.1.2.2
--- src/sys/modules/compat_raid_50/Makefile:1.1.2.1	Sat Sep 22 22:21:46 2018
+++ src/sys/modules/compat_raid_50/Makefile	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.2.1 2018/09/22 22:21:46 pgoyette Exp $
+#	$NetBSD: Makefile,v 1.1.2.2 2018/09/23 01:33:26 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -6,10 +6,6 @@
 
 KMOD=	compat_raid_50
 
-CPPFLAGS+=	-DCOMPAT_50
-
-SRCS+=	compat_50_mod.c
-
 .PATH:	${S}/dev/raidframe
 
 SRCS+=	rf_compat50.c 

Index: src/sys/modules/crypto/Makefile
diff -u src/sys/modules/crypto/Makefile:1.4 src/sys/modules/crypto/Makefile:1.4.16.1
--- src/sys/modules/crypto/Makefile:1.4	Thu Aug 20 11:05:01 2015
+++ src/sys/modules/crypto/Makefile	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2015/08/20 11:05:01 christos Exp $
+#	$NetBSD: Makefile,v 1.4.16.1 2018/09/23 01:33:26 pgoyette Exp $
 
 .include "../Makefile.inc"
 
@@ -8,6 +8,6 @@ CPPFLAGS+=	-DCOMPAT_50
 
 KMOD=	crypto
 IOCONF=	crypto.ioconf
-SRCS=	cryptodev.c ocryptodev.c
+SRCS=	cryptodev.c
 
 .include <bsd.kmodule.mk>

Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.98.2.5 src/sys/opencrypto/cryptodev.c:1.98.2.6
--- src/sys/opencrypto/cryptodev.c:1.98.2.5	Sat Sep 22 10:33:50 2018
+++ src/sys/opencrypto/cryptodev.c	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptodev.c,v 1.98.2.5 2018/09/22 10:33:50 pgoyette Exp $ */
+/*	$NetBSD: cryptodev.c,v 1.98.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $	*/
 /*	$OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $	*/
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.5 2018/09/22 10:33:50 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.98.2.6 2018/09/23 01:33:26 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -228,15 +228,9 @@ cryptof_write(file_t *fp, off_t *poff,
  * code cannot directly reference them as globals.
  */
 MODULE_CALL_HOOK_DECL(ocryptof_50_hook, f,
-    (struct file *fp, u_long cmd, void *data),
-    (fp, cmd, data, cryptodev_mtx, cryptodev_session, cryptodev_op,
-	cryptodev_mop, cryptodev_csefind),
-    enosys());
+    (struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
 MODULE_CALL_HOOK(ocryptof_50_hook, f,
-    (struct file *fp, u_long cmd, void *data),
-    (fp, cmd, data, &cryptodev_mtx, cryptodev_session, cryptodev_op,
-	cryptodev_mop, cryptodev_csefind),
-    enosys());
+    (struct file *fp, u_long cmd, void *data), (fp, cmd, data), enosys());
 
 /* ARGSUSED */
 int

Index: src/sys/opencrypto/files.opencrypto
diff -u src/sys/opencrypto/files.opencrypto:1.26.8.1 src/sys/opencrypto/files.opencrypto:1.26.8.2
--- src/sys/opencrypto/files.opencrypto:1.26.8.1	Sat Sep 22 10:30:00 2018
+++ src/sys/opencrypto/files.opencrypto	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.opencrypto,v 1.26.8.1 2018/09/22 10:30:00 pgoyette Exp $
+#	$NetBSD: files.opencrypto,v 1.26.8.2 2018/09/23 01:33:26 pgoyette Exp $
 #
 #
 
@@ -25,7 +25,7 @@ file	opencrypto/gmac.c		swcrypto
 # (and thus crypto hardware accelerators).
 defpseudo crypto: opencrypto
 file	opencrypto/cryptodev.c		crypto
-file	opencrypto/ocryptodev.c		compat_50
+file	opencrypto/ocryptodev.c		compat_50 & crypto
 
 defflag opt_ocf.h	CRYPTO_DEBUG CRYPTO_TIMING
 defparam opt_ocf.h	CRYPTO_RET_Q_MAXLEN CRYPTO_RET_KQ_MAXLEN

Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.11.2.5 src/sys/opencrypto/ocryptodev.c:1.11.2.6
--- src/sys/opencrypto/ocryptodev.c:1.11.2.5	Sat Sep 22 10:49:09 2018
+++ src/sys/opencrypto/ocryptodev.c	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ocryptodev.c,v 1.11.2.5 2018/09/22 10:49:09 pgoyette Exp $ */
+/*	$NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $	*/
 /*	$OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $	*/
 
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.5 2018/09/22 10:49:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ocryptodev.c,v 1.11.2.6 2018/09/23 01:33:26 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,6 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: ocryptodev.c
 #include <sys/poll.h>
 #include <sys/atomic.h>
 #include <sys/compat_stub.h> 
+#include <sys/module.h>
 
 #ifdef _KERNEL_OPT
 #include "opt_ocf.h"
@@ -101,23 +102,14 @@ __KERNEL_RCSID(0, "$NetBSD: ocryptodev.c
 #include <opencrypto/xform.h>
 
 static int	ocryptodev_op(struct csession *, struct ocrypt_op *,
-		    struct lwp *, int (*)(struct csession *, 
-					struct crypt_op *, struct lwp *));
+		    struct lwp *);
 static int	ocryptodev_mop(struct fcrypt *, struct ocrypt_n_op *, int,
-		    struct lwp *,
-		    int (*real_mop)(struct fcrypt *, struct crypt_n_op *,
-			 int, struct lwp *));
-static int	ocryptodev_session(struct fcrypt *, struct osession_op *,
-		    	int(*)(struct fcrypt *, struct session_op *));
-static int	ocryptodev_msession(struct fcrypt *, struct osession_n_op *,
-			int, int (*)(struct fcrypt *, struct session_op *));
+		    struct lwp *);
+static int	ocryptodev_session(struct fcrypt *, struct osession_op *);
+static int	ocryptodev_msession(struct fcrypt *, struct osession_n_op *);
 
 int
-ocryptof_ioctl(struct file *fp, u_long cmd, void *data, kmutex_t *mtx,
-    int (*real_session)(struct fcrypt *, struct session_op *),
-    int (*real_op)(struct csession *, struct crypt_op *, struct lwp *),
-    int (*real_mop)(struct fcrypt *, struct crypt_n_op *, int, struct lwp *),
-    struct csession * (*real_csefind)(struct fcrypt *, u_int32_t))
+ocryptof_ioctl(struct file *fp, u_long cmd, void *data)
 {
 	struct fcrypt *fcr = fp->f_fcrypt;
 	struct csession *cse;
@@ -133,7 +125,7 @@ ocryptof_ioctl(struct file *fp, u_long c
 	switch (cmd) {
 	case OCIOCGSESSION:
 		osop = (struct osession_op *)data;
-		error = ocryptodev_session(fcr, osop, real_session);
+		error = ocryptodev_session(fcr, osop);
 		break;
 	case CIOCNGSESSION:
 		osgop = (struct ocrypt_sgop *)data;
@@ -150,8 +142,7 @@ ocryptof_ioctl(struct file *fp, u_long c
 			goto mbail;
 		}
 
-		error = ocryptodev_msession(fcr, osnop, osgop->count,
-		    real_session);
+		error = ocryptodev_msession(fcr, osnop, osgop->count);
 		if (error) {
 			goto mbail;
 		}
@@ -164,13 +155,13 @@ mbail:
 	case OCIOCCRYPT:
 		mutex_enter(mtx);
 		ocop = (struct ocrypt_op *)data;
-		cse = (*real_csefind)(fcr, ocop->ses);
+		cse = cryptodev_csefind)(fcr, ocop->ses);
 		mutex_exit(mtx);
 		if (cse == NULL) {
 			DPRINTF("csefind failed\n");
 			return EINVAL;
 		}
-		error = ocryptodev_op(cse, ocop, curlwp, real_op);
+		error = ocryptodev_op(cse, ocop, curlwp);
 		DPRINTF("ocryptodev_op error = %d\n", error);
 		break;
 	case OCIOCNCRYPTM:
@@ -186,7 +177,7 @@ mbail:
 		    (omop->count * sizeof(struct ocrypt_n_op)));
 		if(!error) {
 			error = ocryptodev_mop(fcr, ocnop, omop->count,
-			    curlwp, real_mop);
+			    curlwp);
 			if (!error) {
 				error = copyout(ocnop, omop->reqs, 
 				    (omop->count * sizeof(struct ocrypt_n_op)));
@@ -203,8 +194,7 @@ mbail:
 
 
 static int
-ocryptodev_op(struct csession *cse, struct ocrypt_op *ocop, struct lwp *l,
-    int (*real_op)(struct csession *, struct crypt_op *, struct lwp *))
+ocryptodev_op(struct csession *cse, struct ocrypt_op *ocop, struct lwp *l)
 {
 	struct crypt_op cop;
 
@@ -218,15 +208,12 @@ ocryptodev_op(struct csession *cse, stru
 	cop.iv = ocop->iv;
 	cop.dst_len = 0;
 
-	return real_op(cse, &cop, l);
+	return cryptodev_op(cse, &cop, l);
 };
 
 static int 
-ocryptodev_mop(struct fcrypt *fcr, 
-              struct ocrypt_n_op *ocnop,
-              int count, struct lwp *l,
-	      int (*real_mop)(struct fcrypt *, struct crypt_n_op *, int,
-				struct lwp *))
+ocryptodev_mop(struct fcrypt *fcr, struct ocrypt_n_op *ocnop, int count,
+    struct lwp *l)
 {
 	int res;
 
@@ -248,7 +235,7 @@ ocryptodev_mop(struct fcrypt *fcr, 
 	cnop.mac = ocnop->mac;
 	cnop.iv = ocnop->iv;
 	cnop.dst_len = 0;
-	res = (*real_mop)(fcr, &cnop, count, l);
+	res = cryptodev_mop(fcr, &cnop, count, l);
 	ocnop->reqid = cnop.reqid;
 	ocnop->status = cnop.status;
 
@@ -257,8 +244,7 @@ ocryptodev_mop(struct fcrypt *fcr, 
 
 
 static int
-ocryptodev_session(struct fcrypt *fcr, struct osession_op *osop,
-    int (*real_session)(struct fcrypt *, struct session_op *))
+ocryptodev_session(struct fcrypt *fcr, struct osession_op *osop)
 {
 	struct session_op sop;
 	int res;
@@ -270,7 +256,7 @@ ocryptodev_session(struct fcrypt *fcr, s
 	sop.key = osop->key;
 	sop.mackeylen = osop->mackeylen;
 	sop.mackey = osop->mackey;
-	res = (*real_session)(fcr, &sop);
+	res = cryptodev_session(fcr, &sop);
 	if (res)
 		return res;
 	osop->ses = sop.ses;
@@ -280,8 +266,7 @@ ocryptodev_session(struct fcrypt *fcr, s
 
 static int
 ocryptodev_msession(struct fcrypt *fcr, struct osession_n_op *osn_ops,
-		   int count,
-		   int (*real_session)(struct fcrypt *, struct session_op *))
+		   int count)
 {
 	int i;
 
@@ -294,7 +279,7 @@ ocryptodev_msession(struct fcrypt *fcr, 
 		os_op.mackeylen =	osn_ops->mackeylen;
 		os_op.mackey =		osn_ops->mackey;
 
-		osn_ops->status = ocryptodev_session(fcr, &os_op, real_session);
+		osn_ops->status = ocryptodev_session(fcr, &os_op);
 		osn_ops->ses =		os_op.ses;
 	}
 
@@ -304,16 +289,35 @@ ocryptodev_msession(struct fcrypt *fcr, 
 MODULE_SET_HOOK(ocryptof_50_hook, "cryp50", ocryptof_ioctl);
 MODULE_UNSET_HOOK(ocryptof_50_hook);
 
-void
-cryptodev_50_init(void)
+static void
+crypto_50_init(void)
 {
 
 	ocryptof_50_hook_set();
 }
 
-void
-cryptodev_50_fini(void)
+static void
+crypto_50_fini(void)
 {
 
 	ocryptof_50_hook_unset();
 }
+
+MODULE(MODULE_CLASS_EXEC, compat_crypto_50, "crypto,compat_50");
+ 
+static int
+compat_crypto_50_modcmd(modcmd_t cmd, void *arg)
+{
+ 
+	switch (cmd) {
+	MODULE_CMD_INIT:
+		crypto_50_init();
+		return 0;
+	MODULE_CMD_FINI:
+		crypto_50_fini();
+		return 0;
+	default: 
+		return ENOTTY;
+	}
+}
+

Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.1.2.34 src/sys/sys/compat_stub.h:1.1.2.35
--- src/sys/sys/compat_stub.h:1.1.2.34	Sat Sep 22 10:33:51 2018
+++ src/sys/sys/compat_stub.h	Sun Sep 23 01:33:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.1.2.34 2018/09/22 10:33:51 pgoyette Exp $	*/
+/* $NetBSD: compat_stub.h,v 1.1.2.35 2018/09/23 01:33:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -92,11 +92,7 @@ struct csession;
 struct crypt_op;
 struct crypt_n_op;
 struct kmutex_t;
-MODULE_HOOK(ocryptof_50_hook, (struct file *, u_long, void *, kmutex_t *,
-    int (*)(struct fcrypt *, struct session_op *),
-    int (*)(struct csession *, struct crypt_op *, struct lwp *),
-    int (*)(struct fcrypt *, struct crypt_n_op *, int, struct lwp *),
-    struct csession * (*)(struct fcrypt *, u_int32_t)));
+MODULE_HOOK(ocryptof_50_hook, (struct file *, u_long, void *));
 
 /*
  * raidframe compatability

Added files:

Index: src/sys/modules/compat_crypto_50/Makefile
diff -u /dev/null src/sys/modules/compat_crypto_50/Makefile:1.1.2.1
--- /dev/null	Sun Sep 23 01:33:27 2018
+++ src/sys/modules/compat_crypto_50/Makefile	Sun Sep 23 01:33:26 2018
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2018/09/23 01:33:26 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+CPPFLAGS+=	-DCOMPAT_50
+
+.PATH:	${S}/opencrypto
+
+KMOD=	crypto
+SRCS=	ocryptodev.c ocryptodev.c
+
+.include <bsd.kmodule.mk>

Reply via email to