aboutsummaryrefslogtreecommitdiff
path: root/sys/cam/ctl
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2017-01-22 20:06:15 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2017-01-22 20:06:15 +0000
commitf308ab7043354229b9c7a617ba25a8384b577f91 (patch)
tree8c0d2c3762119dea3adc94481b8fe477e316ece8 /sys/cam/ctl
parentb11244e721037814f7c6f2d3d8d6e1382c8476ef (diff)
downloadsrc-f308ab7043354229b9c7a617ba25a8384b577f91.tar.gz
src-f308ab7043354229b9c7a617ba25a8384b577f91.zip
Remove max_targets and max_target_id CTL port variables; they were unused.
This changes the CTL frontend ABI and thus shouldn't be MFC-ed. Reviewed by: mav@
Notes
Notes: svn path=/head/; revision=312651
Diffstat (limited to 'sys/cam/ctl')
-rw-r--r--sys/cam/ctl/ctl_frontend.h8
-rw-r--r--sys/cam/ctl/ctl_frontend_cam_sim.c5
-rw-r--r--sys/cam/ctl/ctl_frontend_ioctl.c2
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c5
-rw-r--r--sys/cam/ctl/ctl_tpc_local.c2
-rw-r--r--sys/cam/ctl/scsi_ctl.c6
6 files changed, 0 insertions, 28 deletions
diff --git a/sys/cam/ctl/ctl_frontend.h b/sys/cam/ctl/ctl_frontend.h
index 38eb863a08f4..302f14e99795 100644
--- a/sys/cam/ctl/ctl_frontend.h
+++ b/sys/cam/ctl/ctl_frontend.h
@@ -120,7 +120,6 @@ struct ctl_wwpn_iid {
* port_name: A string describing the FETD. e.g. "LSI 1030T U320"
* or whatever you want to use to describe the driver.
*
- *
* physical_port: This is the physical port number of this
* particular port within the driver/hardware. This
* number is hardware/driver specific.
@@ -179,11 +178,6 @@ struct ctl_wwpn_iid {
* to request a dump of any debugging information or
* state to the console.
*
- * max_targets: The maximum number of targets that we can create
- * per-port.
- *
- * max_target_id: The highest target ID that we can use.
- *
* targ_port: The CTL layer assigns a "port number" to every
* FETD. This port number should be passed back in
* in the header of every ctl_io that is queued to
@@ -234,8 +228,6 @@ struct ctl_port {
void *targ_lun_arg; /* passed to CTL */
void (*fe_datamove)(union ctl_io *io); /* passed to CTL */
void (*fe_done)(union ctl_io *io); /* passed to CTL */
- int max_targets; /* passed to CTL */
- int max_target_id; /* passed to CTL */
int32_t targ_port; /* passed back to FETD */
void *ctl_pool_ref; /* passed back to FETD */
uint32_t max_initiators; /* passed back to FETD */
diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c
index 00a960e9e28c..2930d0a06db5 100644
--- a/sys/cam/ctl/ctl_frontend_cam_sim.c
+++ b/sys/cam/ctl/ctl_frontend_cam_sim.c
@@ -147,11 +147,6 @@ cfcs_init(void)
port->onoff_arg = softc;
port->fe_datamove = cfcs_datamove;
port->fe_done = cfcs_done;
-
- /* XXX KDM what should we report here? */
- /* XXX These should probably be fetched from CTL. */
- port->max_targets = 1;
- port->max_target_id = 15;
port->targ_port = -1;
retval = ctl_port_register(port);
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index 4063c97392df..63a9504016ef 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -104,8 +104,6 @@ cfi_init(void)
port->port_name = "ioctl";
port->fe_datamove = cfi_datamove;
port->fe_done = cfi_done;
- port->max_targets = 1;
- port->max_target_id = 0;
port->targ_port = -1;
port->max_initiators = 1;
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 55b56ae18cc6..ca4bda1e2965 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -2127,11 +2127,6 @@ cfiscsi_ioctl_port_create(struct ctl_req *req)
port->onoff_arg = ct;
port->fe_datamove = cfiscsi_datamove;
port->fe_done = cfiscsi_done;
-
- /* XXX KDM what should we report here? */
- /* XXX These should probably be fetched from CTL. */
- port->max_targets = 1;
- port->max_target_id = 15;
port->targ_port = -1;
port->options = opts;
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c
index e5e77b437a26..b0888e9a53d8 100644
--- a/sys/cam/ctl/ctl_tpc_local.c
+++ b/sys/cam/ctl/ctl_tpc_local.c
@@ -95,8 +95,6 @@ tpcl_init(void)
port->port_name = "tpc";
port->fe_datamove = tpcl_datamove;
port->fe_done = tpcl_done;
- port->max_targets = 1;
- port->max_target_id = 0;
port->targ_port = -1;
port->max_initiators = 1;
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 1d3e0485933b..4a3f74372e01 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -402,12 +402,6 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
port->targ_lun_arg = softc;
port->fe_datamove = ctlfe_datamove;
port->fe_done = ctlfe_done;
- /*
- * XXX KDM the path inquiry doesn't give us the maximum
- * number of targets supported.
- */
- port->max_targets = cpi->max_target;
- port->max_target_id = cpi->max_target;
port->targ_port = -1;
/*