svn commit: r216235 - head/sys/dev/mfi

John Baldwin jhb at FreeBSD.org
Mon Dec 6 17:02:56 UTC 2010


Author: jhb
Date: Mon Dec  6 17:02:56 2010
New Revision: 216235
URL: http://svn.freebsd.org/changeset/base/216235

Log:
  When masking direct and processor devices during an inquiry, properly
  preserve the upper bits of the first data byte.
  
  While here, shorten a few nearby lines.
  
  PR:		kern/152768
  Reported by:	Sascha Wildner  saw of online.de
  Reviewed by:	scottl
  MFC after:	1 week

Modified:
  head/sys/dev/mfi/mfi_cam.c

Modified: head/sys/dev/mfi/mfi_cam.c
==============================================================================
--- head/sys/dev/mfi/mfi_cam.c	Mon Dec  6 16:45:36 2010	(r216234)
+++ head/sys/dev/mfi/mfi_cam.c	Mon Dec  6 17:02:56 2010	(r216235)
@@ -340,14 +340,14 @@ mfip_done(struct mfi_command *cm)
 		ccbh->status = CAM_REQ_CMP;
 		csio->scsi_status = pt->header.scsi_status;
 		if (ccbh->flags & CAM_CDB_POINTER)
-			command = ccb->csio.cdb_io.cdb_ptr[0];
+			command = csio->cdb_io.cdb_ptr[0];
 		else
-			command = ccb->csio.cdb_io.cdb_bytes[0];
+			command = csio->cdb_io.cdb_bytes[0];
 		if (command == INQUIRY) {
-			device = ccb->csio.data_ptr[0] & 0x1f;
+			device = csio->data_ptr[0] & 0x1f;
 			if ((device == T_DIRECT) || (device == T_PROCESSOR))
 				csio->data_ptr[0] =
-				     (device & 0xe0) | T_NODEVICE;
+				     (csio->data_ptr[0] & 0xe0) | T_NODEVICE;
 		}
 		break;
 	}


More information about the svn-src-head mailing list