summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2013-09-01 12:18:44 +0000
committermav <mav@FreeBSD.org>2013-09-01 12:18:44 +0000
commit554edd303fabee026ab6a23bf21f05a70170aefe (patch)
tree0860656a124dc41453d268aaf3f60b391c8b841f /sys/cam
parentbe4931fc755cfbabeff5869040c21c5bb045b0d4 (diff)
downloadFreeBSD-src-554edd303fabee026ab6a23bf21f05a70170aefe.zip
FreeBSD-src-554edd303fabee026ab6a23bf21f05a70170aefe.tar.gz
Fix SES_ENABLE_PASSTHROUGH kernel option, unexpectedly broken during driver
overhaul. MFC after: 3 days
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/scsi/scsi_enc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index bb7a1a0..775d8f6 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
#include <cam/scsi/scsi_enc.h>
#include <cam/scsi/scsi_enc_internal.h>
+#include <opt_ses.h>
+
MALLOC_DEFINE(M_SCSIENC, "SCSI ENC", "SCSI ENC buffers");
/* Enclosure type independent driver */
@@ -719,12 +721,12 @@ enc_type(struct ccb_getdev *cgd)
return (ENC_NONE);
}
-#ifdef ENC_ENABLE_PASSTHROUGH
+#ifdef SES_ENABLE_PASSTHROUGH
if ((iqd[6] & 0x40) && (iqd[2] & 0x7) >= 2) {
/*
* PassThrough Device.
*/
- return (ENC_ENC_PASSTHROUGH);
+ return (ENC_SES_PASSTHROUGH);
}
#endif
OpenPOWER on IntegriCloud