Author: jhb
Date: Mon Dec  6 17:06:21 2010
New Revision: 216236
URL: http://svn.freebsd.org/changeset/base/216236

Log:
  When masking direct and processor devices during an inquiry, properly
  preserve the upper bits of the first data byte.
  
  Reviewed by:  scottl
  MFC after:    1 week

Modified:
  head/sys/dev/aac/aac_cam.c

Modified: head/sys/dev/aac/aac_cam.c
==============================================================================
--- head/sys/dev/aac/aac_cam.c  Mon Dec  6 17:02:56 2010        (r216235)
+++ head/sys/dev/aac/aac_cam.c  Mon Dec  6 17:06:21 2010        (r216236)
@@ -587,7 +587,8 @@ aac_cam_complete(struct aac_command *cm)
                                    (device == T_PROCESSOR) ||
                                    (sc->flags & AAC_FLAGS_CAM_PASSONLY))
                                        ccb->csio.data_ptr[0] =
-                                           ((device & 0xe0) | T_NODEVICE);
+                                           ((ccb->csio.data_ptr[0] & 0xe0) |
+                                           T_NODEVICE);
                                } else if (ccb->ccb_h.status == CAM_SEL_TIMEOUT 
&&
                                        ccb->ccb_h.target_lun != 0) {
                                        /* fix for INQUIRYs on Lun>0 */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to