From owner-p4-projects@FreeBSD.ORG  Thu Dec  7 22:01:08 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 3B67D16A47C; Thu,  7 Dec 2006 22:01:08 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 00FC616A403
	for <perforce@freebsd.org>; Thu,  7 Dec 2006 22:01:08 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 28C0543CAE
	for <perforce@freebsd.org>; Thu,  7 Dec 2006 22:00:11 +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 kB7M14If074426
	for <perforce@freebsd.org>; Thu, 7 Dec 2006 22:01:04 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB7M14ja074423
	for perforce@freebsd.org; Thu, 7 Dec 2006 22:01:04 GMT
	(envelope-from mjacob@freebsd.org)
Date: Thu, 7 Dec 2006 22:01:04 GMT
Message-Id: <200612072201.kB7M14ja074423@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 111261 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 Dec 2006 22:01:08 -0000

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

Change 111261 by mjacob@newisp on 2006/12/07 22:00:04

	*Cough* - put back tagged command support for SAS && FC cards.

Affected files ...

.. //depot/projects/newisp/dev/mpt/mpt_cam.c#20 edit

Differences ...

==== //depot/projects/newisp/dev/mpt/mpt_cam.c#20 (text+ko) ====

@@ -3089,8 +3089,9 @@
 		break;
 	}
 	case XPT_GET_TRAN_SETTINGS:
+	{
 		cts = &ccb->cts;
-		cts->protocol = PROTO_SCSI;
+		struct ccb_trans_settings_scsi *scsi;
 		if (mpt->is_fc) {
 			struct ccb_trans_settings_fc *fc =
 			    &cts->xport_specific.fc;
@@ -3108,13 +3109,21 @@
 			cts->transport_version = 0;
 			sas->valid = CTS_SAS_VALID_SPEED;
 			sas->bitrate = 300000;
-		} else if (mpt_get_spi_settings(mpt, cts) != 0) {
-			mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR);
+		} else {
+			if (mpt_get_spi_settings(mpt, cts) != 0) {
+				mpt_set_ccb_status(ccb, CAM_REQ_CMP_ERR);
+			} else {
+				mpt_set_ccb_status(ccb, CAM_REQ_CMP);
+			}
 			break;
 		}
+		cts->protocol = PROTO_SCSI;
+		scsi = &cts->proto_specific.scsi;
+		scsi->valid = CTS_SCSI_VALID_TQ;
+		scsi->flags = CTS_SCSI_FLAGS_TAG_ENB;
 		mpt_set_ccb_status(ccb, CAM_REQ_CMP);
 		break;
-
+	}
 	case XPT_CALC_GEOMETRY:
 	{
 		struct ccb_calc_geometry *ccg;