diff options
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 1 | ||||
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 | ||||
-rw-r--r-- | drivers/scsi/libiscsi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 4 | ||||
-rw-r--r-- | include/scsi/scsi_transport_iscsi.h | 2 |
6 files changed, 1 insertions, 11 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index efc121986c50..32f5d5e79abf 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
@@ -592,7 +592,6 @@ static struct iscsi_transport iscsi_iser_transport = { | |||
592 | .host_template = &iscsi_iser_sht, | 592 | .host_template = &iscsi_iser_sht, |
593 | .conndata_size = sizeof(struct iscsi_conn), | 593 | .conndata_size = sizeof(struct iscsi_conn), |
594 | .max_lun = ISCSI_ISER_MAX_LUN, | 594 | .max_lun = ISCSI_ISER_MAX_LUN, |
595 | .max_cmd_len = ISCSI_ISER_MAX_CMD_LEN, | ||
596 | /* session management */ | 595 | /* session management */ |
597 | .create_session = iscsi_iser_session_create, | 596 | .create_session = iscsi_iser_session_create, |
598 | .destroy_session = iscsi_session_teardown, | 597 | .destroy_session = iscsi_session_teardown, |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index a8c1b300e34d..66a2f30ada01 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.h +++ b/drivers/infiniband/ulp/iser/iscsi_iser.h | |||
@@ -96,7 +96,6 @@ | |||
96 | /* support upto 512KB in one RDMA */ | 96 | /* support upto 512KB in one RDMA */ |
97 | #define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) | 97 | #define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) |
98 | #define ISCSI_ISER_MAX_LUN 256 | 98 | #define ISCSI_ISER_MAX_LUN 256 |
99 | #define ISCSI_ISER_MAX_CMD_LEN 16 | ||
100 | 99 | ||
101 | /* QP settings */ | 100 | /* QP settings */ |
102 | /* Maximal bounds on received asynchronous PDUs */ | 101 | /* Maximal bounds on received asynchronous PDUs */ |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 81c421a7d477..aecadbdce9df 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -1978,8 +1978,6 @@ static struct iscsi_transport iscsi_tcp_transport = { | |||
1978 | ISCSI_HOST_NETDEV_NAME, | 1978 | ISCSI_HOST_NETDEV_NAME, |
1979 | .host_template = &iscsi_sht, | 1979 | .host_template = &iscsi_sht, |
1980 | .conndata_size = sizeof(struct iscsi_conn), | 1980 | .conndata_size = sizeof(struct iscsi_conn), |
1981 | .max_conn = 1, | ||
1982 | .max_cmd_len = 16, | ||
1983 | /* session management */ | 1981 | /* session management */ |
1984 | .create_session = iscsi_tcp_session_create, | 1982 | .create_session = iscsi_tcp_session_create, |
1985 | .destroy_session = iscsi_tcp_session_destroy, | 1983 | .destroy_session = iscsi_tcp_session_destroy, |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index b43bf1d60dac..01a1a4d36f21 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
@@ -1830,7 +1830,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit, | |||
1830 | shost->max_id = 1; | 1830 | shost->max_id = 1; |
1831 | shost->max_channel = 0; | 1831 | shost->max_channel = 0; |
1832 | shost->max_lun = iscsit->max_lun; | 1832 | shost->max_lun = iscsit->max_lun; |
1833 | shost->max_cmd_len = iscsit->max_cmd_len; | 1833 | shost->max_cmd_len = 16; |
1834 | shost->transportt = scsit; | 1834 | shost->transportt = scsit; |
1835 | shost->transportt->create_work_queue = 1; | 1835 | shost->transportt->create_work_queue = 1; |
1836 | shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out; | 1836 | shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out; |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 2a6669d967cb..e6a090e9c8a4 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -102,15 +102,11 @@ static DEVICE_ATTR(name, S_IRUGO, show_transport_##name, NULL); | |||
102 | 102 | ||
103 | show_transport_attr(caps, "0x%x"); | 103 | show_transport_attr(caps, "0x%x"); |
104 | show_transport_attr(max_lun, "%d"); | 104 | show_transport_attr(max_lun, "%d"); |
105 | show_transport_attr(max_conn, "%d"); | ||
106 | show_transport_attr(max_cmd_len, "%d"); | ||
107 | 105 | ||
108 | static struct attribute *iscsi_transport_attrs[] = { | 106 | static struct attribute *iscsi_transport_attrs[] = { |
109 | &dev_attr_handle.attr, | 107 | &dev_attr_handle.attr, |
110 | &dev_attr_caps.attr, | 108 | &dev_attr_caps.attr, |
111 | &dev_attr_max_lun.attr, | 109 | &dev_attr_max_lun.attr, |
112 | &dev_attr_max_conn.attr, | ||
113 | &dev_attr_max_cmd_len.attr, | ||
114 | NULL, | 110 | NULL, |
115 | }; | 111 | }; |
116 | 112 | ||
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index 02a852000be7..afed70ec2aa5 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h | |||
@@ -89,8 +89,6 @@ struct iscsi_transport { | |||
89 | /* LLD session data size */ | 89 | /* LLD session data size */ |
90 | int sessiondata_size; | 90 | int sessiondata_size; |
91 | int max_lun; | 91 | int max_lun; |
92 | unsigned int max_conn; | ||
93 | unsigned int max_cmd_len; | ||
94 | struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it, | 92 | struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it, |
95 | struct scsi_transport_template *t, struct Scsi_Host *shost, | 93 | struct scsi_transport_template *t, struct Scsi_Host *shost, |
96 | uint16_t cmds_max, uint16_t qdepth, uint32_t sn, uint32_t *hn); | 94 | uint16_t cmds_max, uint16_t qdepth, uint32_t sn, uint32_t *hn); |