aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi/libsas.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r--include/scsi/libsas.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index a466c2cb895..e42374cebf9 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -122,8 +122,8 @@ struct ex_phy {
122 u8 attached_sata_dev:1; 122 u8 attached_sata_dev:1;
123 u8 attached_sata_ps:1; 123 u8 attached_sata_ps:1;
124 124
125 enum sas_proto attached_tproto; 125 enum sas_protocol attached_tproto;
126 enum sas_proto attached_iproto; 126 enum sas_protocol attached_iproto;
127 127
128 u8 attached_sas_addr[SAS_ADDR_SIZE]; 128 u8 attached_sas_addr[SAS_ADDR_SIZE];
129 u8 attached_phy_id; 129 u8 attached_phy_id;
@@ -191,8 +191,8 @@ struct domain_device {
191 191
192 struct list_head dev_list_node; 192 struct list_head dev_list_node;
193 193
194 enum sas_proto iproto; 194 enum sas_protocol iproto;
195 enum sas_proto tproto; 195 enum sas_protocol tproto;
196 196
197 struct sas_rphy *rphy; 197 struct sas_rphy *rphy;
198 198
@@ -245,8 +245,8 @@ struct asd_sas_port {
245 enum sas_class class; 245 enum sas_class class;
246 u8 sas_addr[SAS_ADDR_SIZE]; 246 u8 sas_addr[SAS_ADDR_SIZE];
247 u8 attached_sas_addr[SAS_ADDR_SIZE]; 247 u8 attached_sas_addr[SAS_ADDR_SIZE];
248 enum sas_proto iproto; 248 enum sas_protocol iproto;
249 enum sas_proto tproto; 249 enum sas_protocol tproto;
250 250
251 enum sas_oob_mode oob_mode; 251 enum sas_oob_mode oob_mode;
252 252
@@ -289,8 +289,8 @@ struct asd_sas_phy {
289 289
290 int id; /* must be set */ 290 int id; /* must be set */
291 enum sas_class class; 291 enum sas_class class;
292 enum sas_proto iproto; 292 enum sas_protocol iproto;
293 enum sas_proto tproto; 293 enum sas_protocol tproto;
294 294
295 enum sas_phy_type type; 295 enum sas_phy_type type;
296 enum sas_phy_role role; 296 enum sas_phy_role role;
@@ -537,7 +537,7 @@ struct sas_task {
537 spinlock_t task_state_lock; 537 spinlock_t task_state_lock;
538 unsigned task_state_flags; 538 unsigned task_state_flags;
539 539
540 enum sas_proto task_proto; 540 enum sas_protocol task_proto;
541 541
542 /* Used by the discovery code. */ 542 /* Used by the discovery code. */
543 struct timer_list timer; 543 struct timer_list timer;