From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  1 21:01:11 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D48651065679;
	Thu,  1 Oct 2009 21:01:11 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C43B28FC20;
	Thu,  1 Oct 2009 21:01:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n91L1BUu065451;
	Thu, 1 Oct 2009 21:01:11 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91L1B4E065449;
	Thu, 1 Oct 2009 21:01:11 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <200910012101.n91L1B4E065449@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 1 Oct 2009 21:01:11 +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: r197689 - projects/sbruno_firewire/sys/dev/firewire
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, 01 Oct 2009 21:01:11 -0000

Author: sbruno
Date: Thu Oct  1 21:01:11 2009
New Revision: 197689
URL: http://svn.freebsd.org/changeset/base/197689

Log:
  Assign the SIMQ_FREEZED flag to the sbp_softc->flags field instead of stomping on the cam_sim->flags field.

Modified:
  projects/sbruno_firewire/sys/dev/firewire/sbp.c

Modified: projects/sbruno_firewire/sys/dev/firewire/sbp.c
==============================================================================
--- projects/sbruno_firewire/sys/dev/firewire/sbp.c	Thu Oct  1 20:56:15 2009	(r197688)
+++ projects/sbruno_firewire/sys/dev/firewire/sbp.c	Thu Oct  1 21:01:11 2009	(r197689)
@@ -814,8 +814,8 @@ SBP_DEBUG(0)
 	printf("%s\n", __func__);
 END_DEBUG
 	SBP_LOCK(sbp);
-	if ((sbp->sim->flags & SIMQ_FREEZED) == 0) {
-		sbp->sim->flags |= SIMQ_FREEZED;
+	if ((sbp->flags & SIMQ_FREEZED) == 0) {
+		sbp->flags |= SIMQ_FREEZED;
 		xpt_freeze_simq(sbp->sim, /*count*/1);
 		callout_reset(&sbp->busreset_timeout,
 			      scan_delay * hz / 1000,
@@ -835,8 +835,8 @@ sbp_busreset_timeout(void *arg)
 	callout_stop(&sbp->busreset_timeout);
 	printf("%s: Failed to recieved SID from fwohci\n", __func__);
 	SBP_LOCK(sbp);
+	sbp->flags &= ~SIMQ_FREEZED;
 	xpt_release_simq(sbp->sim, /*run queue*/TRUE);
-	sbp->sim->flags &= ~SIMQ_FREEZED;
 	SBP_UNLOCK(sbp);
 	printf("%s: Done\n", __func__);
 }
@@ -904,8 +904,8 @@ END_DEBUG
 			sbp_free_target(target);
 	}
 	SBP_LOCK(sbp);
+	sbp->flags &= ~SIMQ_FREEZED;
 	xpt_release_simq(sbp->sim, /*run queue*/TRUE);
-	sbp->sim->flags &= ~SIMQ_FREEZED;
 	SBP_UNLOCK(sbp);
 }