diff options
Diffstat (limited to 'sys/cam/ctl/ctl_tpc_local.c')
| -rw-r--r-- | sys/cam/ctl/ctl_tpc_local.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c index 7e66340f711a..7664cb94b5bf 100644 --- a/sys/cam/ctl/ctl_tpc_local.c +++ b/sys/cam/ctl/ctl_tpc_local.c @@ -97,11 +97,11 @@ tpcl_init(void) port->fe_done = tpcl_done; port->max_targets = 1; port->max_target_id = 0; + port->targ_port = -1; port->max_initiators = 1; - if (ctl_port_register(port) != 0) - { - printf("%s: tpc frontend registration failed\n", __func__); + if (ctl_port_register(port) != 0) { + printf("%s: ctl_port_register() failed with error\n", __func__); return (0); } @@ -287,7 +287,7 @@ tpcl_resolve(struct ctl_softc *softc, int init_port, cscdid = (struct scsi_ec_cscd_id *)cscd; mtx_lock(&softc->ctl_lock); if (init_port >= 0) - port = softc->ctl_ports[ctl_port_idx(init_port)]; + port = softc->ctl_ports[init_port]; else port = NULL; STAILQ_FOREACH(lun, &softc->lun_list, links) { @@ -328,9 +328,8 @@ tpcl_queue(union ctl_io *io, uint64_t lun) { struct tpcl_softc *tsoftc = &tpcl_softc; - io->io_hdr.nexus.initid.id = 0; + io->io_hdr.nexus.initid = 0; io->io_hdr.nexus.targ_port = tsoftc->port.targ_port; - io->io_hdr.nexus.targ_target.id = 0; io->io_hdr.nexus.targ_lun = lun; io->scsiio.tag_num = atomic_fetchadd_int(&tsoftc->cur_tag_num, 1); io->scsiio.ext_data_filled = 0; |