diff options
| -rw-r--r-- | sys/dev/softraid.c | 6 | ||||
| -rw-r--r-- | sys/dev/softraidvar.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 408516f511e..ae42039372c 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.97 2008/01/29 23:25:02 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.98 2008/02/03 00:25:21 marco Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -911,9 +911,9 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user) #ifdef CRYPTO case 'C': /* fill out discipline members */ - sd->sd_type = SR_MD_RAIDCRYPTO; + sd->sd_type = SR_MD_CRYPTO; sd->sd_max_ccb_per_wu = no_chunk; - sd->sd_max_wu = SR_RAIDCRYPTO_NOWU; + sd->sd_max_wu = SR_CRYPTO_NOWU; /* setup discipline pointers */ sd->sd_alloc_resources = sr_crypto_alloc_resources; diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index 24a87d53bc0..214ea8ba901 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.40 2008/01/29 23:25:02 marco Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.41 2008/02/03 00:25:21 marco Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -134,7 +134,7 @@ struct sr_raid1 { }; /* RAID CRYPTO */ -#define SR_RAIDCRYPTO_NOWU 16 +#define SR_CRYPTO_NOWU 16 struct sr_crypto { u_int64_t src_sid; char src_key[64]; @@ -267,7 +267,7 @@ struct sr_discipline { #define SR_MD_RAID1 1 #define SR_MD_RAID5 2 #define SR_MD_CACHE 3 -#define SR_MD_RAIDCRYPTO 4 +#define SR_MD_CRYPTO 4 char sd_name[10]; /* human readable dis name */ u_int8_t sd_scsibus; /* scsibus discipline uses */ struct scsi_link sd_link; /* link to midlayer */ |