From owner-svn-src-all@FreeBSD.ORG  Fri Aug 21 01:00:16 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F168106568B;
	Fri, 21 Aug 2009 01:00:16 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E2BD8FC57;
	Fri, 21 Aug 2009 01:00:16 +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 n7L10G2P006601;
	Fri, 21 Aug 2009 01:00:16 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7L10GsI006599;
	Fri, 21 Aug 2009 01:00:16 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <200908210100.n7L10GsI006599@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Fri, 21 Aug 2009 01:00:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196415 - head/sys/dev/hptrr
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2009 01:00:16 -0000

Author: kensmith
Date: Fri Aug 21 01:00:15 2009
New Revision: 196415
URL: http://svn.freebsd.org/changeset/base/196415

Log:
  Fix a boot hang for hptrr(4) caused by changes introduced in r195534.
  It is necessary to make sure cpi->transport is set for xpt_scan_bus() to
  work properly.
  
  Submitted by: Bernhard Schmidt (scb+freebsd-current <at> techwires
                <dot> net)
  Reviewed by:  scottl
  Approved by:  re (kib)

Modified:
  head/sys/dev/hptrr/hptrr_osm_bsd.c

Modified: head/sys/dev/hptrr/hptrr_osm_bsd.c
==============================================================================
--- head/sys/dev/hptrr/hptrr_osm_bsd.c	Thu Aug 20 23:07:53 2009	(r196414)
+++ head/sys/dev/hptrr/hptrr_osm_bsd.c	Fri Aug 21 01:00:15 2009	(r196415)
@@ -814,6 +814,10 @@ static void hpt_action(struct cam_sim *s
 		strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strncpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+		cpi->protocol = PROTO_SCSI;
+		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}