svn commit: r255534 - stable/9/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Sat Sep 14 08:22:57 2013
New Revision: 255534
URL: http://svnweb.freebsd.org/changeset/base/255534

Log:
  MFC r255119:
  Fix SES_ENABLE_PASSTHROUGH kernel option, unexpectedly broken during driver
  overhaul.

Modified:
  stable/9/sys/cam/scsi/scsi_enc.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_enc.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_enc.c	Sat Sep 14 06:43:09 2013	(r255533)
+++ stable/9/sys/cam/scsi/scsi_enc.c	Sat Sep 14 08:22:57 2013	(r255534)
@@ -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