summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsd210035 <none@none>2008-02-19 16:12:25 -0800
committersd210035 <none@none>2008-02-19 16:12:25 -0800
commit3a113f0aef79ffc54ddc37d82071ebe76e7428a3 (patch)
tree9618bab530de6154689a1293509e4b910f1dc35a
parentb779d3e04b6c453fc372ef1dbf8df01a8c2e10dc (diff)
downloadillumos-gate-onnv_84.tar.gz
6496288 Passing pkt_private data seems to panic scsi_vhcionnv_84
6509331 nws_1540 & nws_1530: LCA controller timeouts require > 60 seconds under heavy IO. 6509762 nws_1540: MICROCODE_CHANGED message not handled 6656523 Solaris did not retry the UA_INQUIRY_DATA_CHANGED for Mode Sense.
-rw-r--r--usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c5
-rw-r--r--usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
index de66a0e101..ef21a261e0 100644
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c
@@ -1834,7 +1834,6 @@ vhci_scsi_init_pkt(struct scsi_address *ap, struct scsi_pkt *pkt,
vpkt->vpkt_state = VHCI_PKT_IDLE;
vpkt->vpkt_tgt_init_cdblen = cmdlen;
vpkt->vpkt_tgt_init_scblen = statuslen;
- vpkt->vpkt_tgt_init_privlen = tgtlen;
newpkt = 1;
} else { /* pkt not NULL */
vpkt = pkt->pkt_ha_private;
@@ -2371,7 +2370,7 @@ bind_path:
pkt = scsi_init_pkt(address, pkt,
vpkt->vpkt_tgt_init_bp, vpkt->vpkt_tgt_init_cdblen,
vpkt->vpkt_tgt_init_scblen,
- vpkt->vpkt_tgt_init_privlen, flags, func, NULL);
+ 0, flags, func, NULL);
if (pkt == NULL) {
VHCI_DEBUG(4, (CE_NOTE, NULL,
@@ -7984,7 +7983,7 @@ vhci_create_retry_pkt(struct vhci_pkt *vpkt)
*/
pkt = vhci_scsi_init_pkt(&svp->svp_psd->sd_address, pkt,
vpkt->vpkt_tgt_init_bp, vpkt->vpkt_tgt_init_cdblen,
- vpkt->vpkt_tgt_init_scblen, vpkt->vpkt_tgt_init_privlen,
+ vpkt->vpkt_tgt_init_scblen, 0,
PKT_CONSISTENT,
NULL_FUNC, NULL);
if (pkt != NULL) {
diff --git a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
index c1d9729787..ad4099cddb 100644
--- a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
+++ b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -271,7 +271,6 @@ struct vhci_pkt {
* bind to
*/
int vpkt_tgt_init_cdblen;
- int vpkt_tgt_init_privlen;
int vpkt_tgt_init_scblen;
int vpkt_tgt_init_pkt_flags;
struct buf *vpkt_tgt_init_bp;