svn commit: r235248 - projects/iscsi_opt/sys/dev/iscsi/initiator

[Kip Macy]

Author: kmacy
Date: Thu May 10 22:32:33 2012
New Revision: 235248
URL: http://svn.freebsd.org/changeset/base/235248

Log:
  don't overwrite RELEASE_SIMQ from status

Modified:
  projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c

Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c
==============================================================================
--- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c	Thu May 10 22:00:38 2012	(r235247)
+++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c	Thu May 10 22:32:33 2012	(r235248)
@@ -232,7 +232,7 @@ _scsi_done(isc_session_t *sp, u_int resp
 
 	  case 0x18: // Reservation Conflict
 	  case 0x28: // Task Set Full
-	       ccb_h->status = CAM_REQUEUE_REQ;
+	       ccb_h->status |= CAM_REQUEUE_REQ;
 	       break;
 	  default:
 	       //case 0x22: // Command Terminated
@@ -270,9 +270,10 @@ iscsi_requeue(isc_session_t *sp)
      while((pq = i_dqueue_hld(sp)) != NULL) {
 	  i++;
 	  if(pq->ccb != NULL) {
+	    pq->ccb->ccb_h.status = 0;
 	    if (sp->cam_flags & ISC_QFROZEN) {
 	      sp->space_needed = 0;
-	      pq->ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
+	      pq->ccb->ccb_h.status = CAM_RELEASE_SIMQ;
 	      sp->cam_flags &= ~ISC_QFROZEN;
 	    }
 	       _scsi_done(sp, 0, 0x28, pq->ccb, NULL);