From owner-svn-src-projects@FreeBSD.ORG  Thu May 10 22:32:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 35D81106564A;
	Thu, 10 May 2012 22:32:34 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 21C988FC0A;
	Thu, 10 May 2012 22:32:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4AMWXp9054592;
	Thu, 10 May 2012 22:32:33 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4AMWXZ2054590;
	Thu, 10 May 2012 22:32:33 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201205102232.q4AMWXZ2054590@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 10 May 2012 22:32:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235248 - projects/iscsi_opt/sys/dev/iscsi/initiator
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 22:32:34 -0000

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);