diff options
Diffstat (limited to 'sys/dev/ocs_fc')
| -rw-r--r-- | sys/dev/ocs_fc/ocs_cam.c | 4 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_hw.c | 4 | ||||
| -rw-r--r-- | sys/dev/ocs_fc/ocs_os.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ocs_fc/ocs_cam.c b/sys/dev/ocs_fc/ocs_cam.c index a944c7628d85..772e7ca1c383 100644 --- a/sys/dev/ocs_fc/ocs_cam.c +++ b/sys/dev/ocs_fc/ocs_cam.c @@ -700,8 +700,8 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lun, ocs_scsi_tmf_cmd_e cmd, trsrc = &fcp->targ_rsrc_wildcard; } - device_printf(tmfio->ocs->dev, "%s: io=%p cmd=%#x LU=%lx en=%s\n", - __func__, tmfio, cmd, (unsigned long)lun, + device_printf(tmfio->ocs->dev, "%s: io=%u(index) cmd=%#x LU=%lx en=%s\n", + __func__, tmfio->instance_index, cmd, (unsigned long)lun, trsrc ? (trsrc->enabled ? "T" : "F") : "X"); if (trsrc) { inot = (struct ccb_immediate_notify *)STAILQ_FIRST(&trsrc->inot); diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c index cfb9d4f8f536..62ef3cd49be3 100644 --- a/sys/dev/ocs_fc/ocs_hw.c +++ b/sys/dev/ocs_fc/ocs_hw.c @@ -11214,7 +11214,7 @@ target_wqe_timer_nop_cb(ocs_hw_t *hw, int32_t status, uint8_t *mqe, void *arg) getmicrouptime(&cur_time); timevalsub(&cur_time, &io->submit_time); if (cur_time.tv_sec > io->wqe_timeout) { - ocs_log_info(hw->os, "IO timeout xri=0x%x tag=0x%x type=%d elasped time:%u\n", + ocs_log_info(hw->os, "IO timeout xri=0x%x tag=0x%x type=%d elapsed time:%u\n", io->indicator, io->reqtag, io->type, cur_time.tv_sec); /* remove from active_wqe list so won't try to abort again */ @@ -12192,7 +12192,7 @@ ocs_hw_set_persistent_topology(ocs_hw_t *hw, uint32_t topology, uint32_t opts) param.persistent_topo = SLI4_INIT_LINK_F_P2P_FAIL_OVER; param.topo_failover = 1; } else { - param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY;; + param.persistent_topo = SLI4_INIT_LINK_F_P2P_ONLY; param.topo_failover = 0; } break; diff --git a/sys/dev/ocs_fc/ocs_os.h b/sys/dev/ocs_fc/ocs_os.h index 9e3beff35548..331d5b07aecd 100644 --- a/sys/dev/ocs_fc/ocs_os.h +++ b/sys/dev/ocs_fc/ocs_os.h @@ -56,10 +56,10 @@ #include <sys/taskqueue.h> #include <sys/bitstring.h> #include <sys/stack.h> +#include <sys/stdarg.h> #include <machine/atomic.h> #include <machine/bus.h> -#include <machine/stdarg.h> #include <dev/pci/pcivar.h> |