Author: mav
Date: Tue Aug 18 08:46:54 2009
New Revision: 196352
URL: http://svn.freebsd.org/changeset/base/196352
Log:
Fix iSCSI initiator and vpo driver operation, broken by CAM changes.
Reviewed by: scottl, Danny Braniss
Approved by: re (rwatson)
Modified:
head/sys/cam/cam_ccb.h
head/sys/cam/cam_xpt.c
head/sys/dev/iscsi/initiator/isc_cam.c
head/sys/dev/ppbus/vpo.c
Modified: head/sys/cam/cam_ccb.h
==============================================================================
--- head/sys/cam/cam_ccb.h Mon Aug 17 23:50:57 2009 (r196351)
+++ head/sys/cam/cam_ccb.h Tue Aug 18 08:46:54 2009 (r196352)
@@ -243,6 +243,7 @@ typedef enum {
XPORT_ATA, /* AT Attachment */
XPORT_SAS, /* Serial Attached SCSI */
XPORT_SATA, /* Serial AT Attachment */
+ XPORT_ISCSI, /* iSCSI */
} cam_xport;
#define PROTO_VERSION_UNKNOWN (UINT_MAX - 1)
Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c Mon Aug 17 23:50:57 2009 (r196351)
+++ head/sys/cam/cam_xpt.c Tue Aug 18 08:46:54 2009 (r196352)
@@ -3803,6 +3803,8 @@ xpt_bus_register(struct cam_sim *sim, de
case XPORT_SAS:
case XPORT_FC:
case XPORT_USB:
+ case XPORT_ISCSI:
+ case XPORT_PPB:
new_bus->xport = scsi_get_xport();
break;
case XPORT_ATA:
Modified: head/sys/dev/iscsi/initiator/isc_cam.c
==============================================================================
--- head/sys/dev/iscsi/initiator/isc_cam.c Mon Aug 17 23:50:57 2009
(r196351)
+++ head/sys/dev/iscsi/initiator/isc_cam.c Tue Aug 18 08:46:54 2009
(r196352)
@@ -190,6 +190,8 @@ _inq(struct cam_sim *sim, union ccb *ccb
strncpy(cpi->hba_vid, "iSCSI", HBA_IDLEN);
strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
+ cpi->transport = XPORT_ISCSI;
+ cpi->transport_version = 0;
cpi->ccb_h.status = CAM_REQ_CMP;
}
Modified: head/sys/dev/ppbus/vpo.c
==============================================================================
--- head/sys/dev/ppbus/vpo.c Mon Aug 17 23:50:57 2009 (r196351)
+++ head/sys/dev/ppbus/vpo.c Tue Aug 18 08:46:54 2009 (r196352)
@@ -427,6 +427,8 @@ vpo_action(struct cam_sim *sim, union cc
strncpy(cpi->hba_vid, "Iomega", HBA_IDLEN);
strncpy(cpi->dev_name, sim->sim_name, DEV_IDLEN);
cpi->unit_number = sim->unit_number;
+ cpi->transport = XPORT_PPB;
+ cpi->transport_version = 0;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
