Module Name: src
Committed By: riz
Date: Thu Nov 22 17:19:56 UTC 2012
Modified Files:
src/sys/dev/ic [netbsd-6]: mpt_netbsd.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #686):
sys/dev/ic/mpt_netbsd.c: revision 1.19
set chan_bustype correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/dev/ic/mpt_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mpt_netbsd.c
diff -u src/sys/dev/ic/mpt_netbsd.c:1.17 src/sys/dev/ic/mpt_netbsd.c:1.17.2.1
--- src/sys/dev/ic/mpt_netbsd.c:1.17 Mon Jan 30 17:45:14 2012
+++ src/sys/dev/ic/mpt_netbsd.c Thu Nov 22 17:19:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.17 2012/01/30 17:45:14 mhitch Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.17.2.1 2012/11/22 17:19:56 riz Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.17 2012/01/30 17:45:14 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.17.2.1 2012/11/22 17:19:56 riz Exp $");
#include <dev/ic/mpt.h> /* pulls in all headers */
@@ -118,7 +118,13 @@ mpt_scsipi_attach(mpt_softc_t *mpt)
/* Fill in the scsipi_channel. */
memset(chan, 0, sizeof(*chan));
chan->chan_adapter = adapt;
- chan->chan_bustype = &scsi_bustype;
+ if (mpt->is_sas) {
+ chan->chan_bustype = &scsi_sas_bustype;
+ } else if (mpt->is_fc) {
+ chan->chan_bustype = &scsi_fc_bustype;
+ } else {
+ chan->chan_bustype = &scsi_bustype;
+ }
chan->chan_channel = 0;
chan->chan_flags = 0;
chan->chan_nluns = 8;
