changeset 6042:b578f00bc056 onnv_84

6496288 Passing pkt_private data seems to panic scsi_vhci 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.
author sd210035
date Tue, 19 Feb 2008 16:12:25 -0800
parents e35bc57647fd
children f4f7079bc001
files usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c	Tue Feb 19 15:52:18 2008 -0800
+++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.c	Tue Feb 19 16:12:25 2008 -0800
@@ -1834,7 +1834,6 @@
 		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 @@
 		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 @@
 	 */
 	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) {
--- a/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h	Tue Feb 19 15:52:18 2008 -0800
+++ b/usr/src/uts/common/sys/scsi/adapters/scsi_vhci.h	Tue Feb 19 16:12:25 2008 -0800
@@ -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 @@
 	 * 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;