summaryrefslogtreecommitdiffstats
path: root/sys/opencrypto
diff options
context:
space:
mode:
authordillon <dillon@FreeBSD.org>2003-01-13 00:33:17 +0000
committerdillon <dillon@FreeBSD.org>2003-01-13 00:33:17 +0000
commitccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 (patch)
treeee3c8690226ac4a086122b794c975aab9319b671 /sys/opencrypto
parentfe540b81bb4ea3115544cd0f082b4ecd39cebb62 (diff)
downloadFreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.zip
FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.tar.gz
Bow to the whining masses and change a union back into void *. Retain
removal of unnecessary casts and throw in some minor cleanups to see if anyone complains, just for the hell of it.
Diffstat (limited to 'sys/opencrypto')
-rw-r--r--sys/opencrypto/cryptodev.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
index 07ea04f..8b51d69 100644
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -134,7 +134,7 @@ cryptof_ioctl(
struct thread *td)
{
struct cryptoini cria, crie;
- struct fcrypt *fcr = fp->un_data.fcrypt;
+ struct fcrypt *fcr = fp->f_data;
struct csession *cse;
struct session_op *sop;
struct crypt_op *cop;
@@ -608,7 +608,7 @@ cryptof_stat(
static int
cryptof_close(struct file *fp, struct thread *td)
{
- struct fcrypt *fcr = fp->un_data.fcrypt;
+ struct fcrypt *fcr = fp->f_data;
struct csession *cse;
while ((cse = TAILQ_FIRST(&fcr->csessions))) {
@@ -616,7 +616,7 @@ cryptof_close(struct file *fp, struct thread *td)
(void)csefree(cse);
}
FREE(fcr, M_XDATA);
- fp->un_data.fcrypt = NULL;
+ fp->f_data = NULL;
return 0;
}
@@ -733,7 +733,7 @@ cryptoioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
f->f_flag = FREAD | FWRITE;
f->f_type = DTYPE_CRYPTO;
f->f_ops = &cryptofops;
- f->un_data.fcrypt = fcr;
+ f->f_data = fcr;
*(u_int32_t *)data = fd;
fdrop(f, td);
break;
OpenPOWER on IntegriCloud