d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix iSCSI initiator and vpo driver operation, broken by CAM changes.

Browse Source 
Reviewed by:	scottl, Danny Braniss
Approved by:	re (rwatson)
This commit is contained in:
Alexander Motin 2009-08-18 08:46:54 +00:00
parent d53e359b9a
commit 33ea30fed7
4 changed files with 7 additions and 0 deletions
sys
cam
cam_ccb.hcam_xpt.c
dev
iscsi/initiator
isc_cam.c
ppbus
vpo.c

1
sys/cam/cam_ccb.h

@ -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)

2
sys/cam/cam_xpt.c

@ -3803,6 +3803,8 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus)
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:

2
sys/dev/iscsi/initiator/isc_cam.c

@ -190,6 +190,8 @@ _inq(struct cam_sim *sim, union ccb *ccb, int maxluns)
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;
}

2
sys/dev/ppbus/vpo.c

@ -427,6 +427,8 @@ vpo_action(struct cam_sim *sim, union ccb *ccb)
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);