summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2008-06-14 00:16:39 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2008-06-14 00:16:39 +0000
commitcb87b207f7c3c47d5e8e56db66a2abb2a97680b4 (patch)
tree71c926d69b834d6210963a557242475935c73e6a /sys/dev
parent27abd0daebe4b681531d6b0b5f4ee6a61c0800e0 (diff)
Update bioctl(8) and softraid(4) to recent changes and enable softraid
crypto. It's still considered experimental! ok djm marco
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/softraid.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 4e7117b4b29..6243a8be7bb 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.113 2008/06/13 18:26:59 hshoexer Exp $ */
+/* $OpenBSD: softraid.c,v 1.114 2008/06/14 00:16:38 hshoexer Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -818,7 +818,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
strlcpy(sd->sd_name, "RAID 1", sizeof(sd->sd_name));
vol_size = ch_entry->src_meta.scm_coerced_size;
break;
-#if 0
#ifdef CRYPTO
case 'C':
DNPRINTF(SR_D_IOCTL,
@@ -841,7 +840,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user)
break;
#endif /* CRYPTO */
-#endif
default:
goto unwind;
}