From owner-p4-projects@FreeBSD.ORG  Thu Sep  7 05:17:51 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 674C316A4E5; Thu,  7 Sep 2006 05:17:51 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4215616A4DF
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 05:17:51 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6BE4943D49
	for <perforce@freebsd.org>; Thu,  7 Sep 2006 05:17:50 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k875Ho9H052281
	for <perforce@freebsd.org>; Thu, 7 Sep 2006 05:17:50 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k875Hoja052273
	for perforce@freebsd.org; Thu, 7 Sep 2006 05:17:50 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 7 Sep 2006 05:17:50 GMT
Message-Id: <200609070517.k875Hoja052273@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105765 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Sep 2006 05:17:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=105765

Change 105765 by mjacob@newisp on 2006/09/07 05:17:17

	IFC

Affected files ...

.. //depot/projects/newisp/dev/mfi/mfi.c#2 integrate

Differences ...

==== //depot/projects/newisp/dev/mfi/mfi.c#2 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.13 2006/06/30 18:59:08 ambrisko Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.14 2006/09/07 05:05:41 scottl Exp $");
 
 #include "opt_mfi.h"
 
@@ -779,17 +779,10 @@
 	mtx_lock(&sc->mfi_io_lock);
 	while (ci != pi) {
 		context = sc->mfi_comms->hw_reply_q[ci];
-		sc->mfi_comms->hw_reply_q[ci] = 0xffffffff;
-		if (context == 0xffffffff) {
-			device_printf(sc->mfi_dev, "mfi_intr: invalid context "
-			    "pi= %d ci= %d\n", pi, ci);
-		} else {
-			cm = &sc->mfi_commands[context];
-			mfi_remove_busy(cm);
-			mfi_complete(sc, cm);
-		}
-		ci++;
-		if (ci == (sc->mfi_max_fw_cmds + 1)) {
+		cm = &sc->mfi_commands[context];
+		mfi_remove_busy(cm);
+		mfi_complete(sc, cm);
+		if (++ci == (sc->mfi_max_fw_cmds + 1)) {
 			ci = 0;
 		}
 	}