diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2016-05-15 01:28:51 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2016-05-17 01:23:59 -0400 |
commit | ff7199b04f08e1a72637ba66cd2c05842dc592d0 (patch) | |
tree | 3d0fd0c6ba33c4328777adceb42a7d232193897d | |
parent | bd027d856d3d7260017d0dc932201ce5fd7561f9 (diff) |
cxgbit: Use type ISCSI_CXGBIT + cxgbit tpg_np attribute
Instead of having cxgbit use type ISCSI_HW_OFFLOAD + 'hw_offload'
tpg_np attribute, it should be using it's own driver specific
type + attribute
Cc: Varun Prakash <varun@chelsio.com>
Cc: Hariprasad Shenai <hariprasad@chelsio.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/iscsi/cxgbit/cxgbit_main.c | 2 | ||||
-rw-r--r-- | drivers/target/iscsi/iscsi_target_configfs.c | 14 | ||||
-rw-r--r-- | include/target/iscsi/iscsi_target_core.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/target/iscsi/cxgbit/cxgbit_main.c b/drivers/target/iscsi/cxgbit/cxgbit_main.c index c25f5313322c..60dccd02bd85 100644 --- a/drivers/target/iscsi/cxgbit/cxgbit_main.c +++ b/drivers/target/iscsi/cxgbit/cxgbit_main.c | |||
@@ -624,7 +624,7 @@ static enum target_prot_op cxgbit_get_sup_prot_ops(struct iscsi_conn *conn) | |||
624 | 624 | ||
625 | static struct iscsit_transport cxgbit_transport = { | 625 | static struct iscsit_transport cxgbit_transport = { |
626 | .name = DRV_NAME, | 626 | .name = DRV_NAME, |
627 | .transport_type = ISCSI_HW_OFFLOAD, | 627 | .transport_type = ISCSI_CXGBIT, |
628 | .rdma_shutdown = false, | 628 | .rdma_shutdown = false, |
629 | .priv_size = sizeof(struct cxgbit_cmd), | 629 | .priv_size = sizeof(struct cxgbit_cmd), |
630 | .owner = THIS_MODULE, | 630 | .owner = THIS_MODULE, |
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index 33d811ac9539..923c032f0b95 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c | |||
@@ -131,22 +131,22 @@ static ssize_t lio_target_np_iser_store(struct config_item *item, | |||
131 | } | 131 | } |
132 | CONFIGFS_ATTR(lio_target_np_, iser); | 132 | CONFIGFS_ATTR(lio_target_np_, iser); |
133 | 133 | ||
134 | static ssize_t lio_target_np_hw_offload_show(struct config_item *item, char *page) | 134 | static ssize_t lio_target_np_cxgbit_show(struct config_item *item, char *page) |
135 | { | 135 | { |
136 | return lio_target_np_driver_show(item, page, ISCSI_HW_OFFLOAD); | 136 | return lio_target_np_driver_show(item, page, ISCSI_CXGBIT); |
137 | } | 137 | } |
138 | 138 | ||
139 | static ssize_t lio_target_np_hw_offload_store(struct config_item *item, | 139 | static ssize_t lio_target_np_cxgbit_store(struct config_item *item, |
140 | const char *page, size_t count) | 140 | const char *page, size_t count) |
141 | { | 141 | { |
142 | return lio_target_np_driver_store(item, page, count, | 142 | return lio_target_np_driver_store(item, page, count, |
143 | ISCSI_HW_OFFLOAD, ""); | 143 | ISCSI_CXGBIT, "cxgbit"); |
144 | } | 144 | } |
145 | CONFIGFS_ATTR(lio_target_np_, hw_offload); | 145 | CONFIGFS_ATTR(lio_target_np_, cxgbit); |
146 | 146 | ||
147 | static struct configfs_attribute *lio_target_portal_attrs[] = { | 147 | static struct configfs_attribute *lio_target_portal_attrs[] = { |
148 | &lio_target_np_attr_iser, | 148 | &lio_target_np_attr_iser, |
149 | &lio_target_np_attr_hw_offload, | 149 | &lio_target_np_attr_cxgbit, |
150 | NULL, | 150 | NULL, |
151 | }; | 151 | }; |
152 | 152 | ||
diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h index 110c1fde7c68..4ac24f5a3308 100644 --- a/include/target/iscsi/iscsi_target_core.h +++ b/include/target/iscsi/iscsi_target_core.h | |||
@@ -74,7 +74,7 @@ enum iscsit_transport_type { | |||
74 | ISCSI_IWARP_TCP = 3, | 74 | ISCSI_IWARP_TCP = 3, |
75 | ISCSI_IWARP_SCTP = 4, | 75 | ISCSI_IWARP_SCTP = 4, |
76 | ISCSI_INFINIBAND = 5, | 76 | ISCSI_INFINIBAND = 5, |
77 | ISCSI_HW_OFFLOAD = 6, | 77 | ISCSI_CXGBIT = 6, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | /* RFC-3720 7.1.4 Standard Connection State Diagram for a Target */ | 80 | /* RFC-3720 7.1.4 Standard Connection State Diagram for a Target */ |