svn commit: r255119 - head/sys/cam/scsi
Alexander Motin
mav at FreeBSD.org
Sun Sep 1 12:18:45 UTC 2013
Author: mav
Date: Sun Sep 1 12:18:44 2013
New Revision: 255119
URL: http://svnweb.freebsd.org/changeset/base/255119
Log:
Fix SES_ENABLE_PASSTHROUGH kernel option, unexpectedly broken during driver
overhaul.
MFC after: 3 days
Modified:
head/sys/cam/scsi/scsi_enc.c
Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c Sun Sep 1 11:50:37 2013 (r255118)
+++ head/sys/cam/scsi/scsi_enc.c Sun Sep 1 12:18:44 2013 (r255119)
@@ -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
More information about the svn-src-all
mailing list