diff options
Diffstat (limited to 'include/scsi/scsi_transport_sas.h')
| -rw-r--r-- | include/scsi/scsi_transport_sas.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h index e3c503cd175e..6cc2314098cf 100644 --- a/include/scsi/scsi_transport_sas.h +++ b/include/scsi/scsi_transport_sas.h | |||
| @@ -106,6 +106,7 @@ struct sas_end_device { | |||
| 106 | 106 | ||
| 107 | struct sas_expander_device { | 107 | struct sas_expander_device { |
| 108 | int level; | 108 | int level; |
| 109 | int next_port_id; | ||
| 109 | 110 | ||
| 110 | #define SAS_EXPANDER_VENDOR_ID_LEN 8 | 111 | #define SAS_EXPANDER_VENDOR_ID_LEN 8 |
| 111 | char vendor_id[SAS_EXPANDER_VENDOR_ID_LEN+1]; | 112 | char vendor_id[SAS_EXPANDER_VENDOR_ID_LEN+1]; |
| @@ -127,8 +128,10 @@ struct sas_expander_device { | |||
| 127 | struct sas_port { | 128 | struct sas_port { |
| 128 | struct device dev; | 129 | struct device dev; |
| 129 | 130 | ||
| 130 | u8 port_identifier; | 131 | int port_identifier; |
| 131 | int num_phys; | 132 | int num_phys; |
| 133 | /* port flags */ | ||
| 134 | unsigned int is_backlink:1; | ||
| 132 | 135 | ||
| 133 | /* the other end of the link */ | 136 | /* the other end of the link */ |
| 134 | struct sas_rphy *rphy; | 137 | struct sas_rphy *rphy; |
| @@ -168,11 +171,13 @@ extern void sas_rphy_delete(struct sas_rphy *); | |||
| 168 | extern int scsi_is_sas_rphy(const struct device *); | 171 | extern int scsi_is_sas_rphy(const struct device *); |
| 169 | 172 | ||
| 170 | struct sas_port *sas_port_alloc(struct device *, int); | 173 | struct sas_port *sas_port_alloc(struct device *, int); |
| 174 | struct sas_port *sas_port_alloc_num(struct device *); | ||
| 171 | int sas_port_add(struct sas_port *); | 175 | int sas_port_add(struct sas_port *); |
| 172 | void sas_port_free(struct sas_port *); | 176 | void sas_port_free(struct sas_port *); |
| 173 | void sas_port_delete(struct sas_port *); | 177 | void sas_port_delete(struct sas_port *); |
| 174 | void sas_port_add_phy(struct sas_port *, struct sas_phy *); | 178 | void sas_port_add_phy(struct sas_port *, struct sas_phy *); |
| 175 | void sas_port_delete_phy(struct sas_port *, struct sas_phy *); | 179 | void sas_port_delete_phy(struct sas_port *, struct sas_phy *); |
| 180 | void sas_port_mark_backlink(struct sas_port *); | ||
| 176 | int scsi_is_sas_port(const struct device *); | 181 | int scsi_is_sas_port(const struct device *); |
| 177 | 182 | ||
| 178 | extern struct scsi_transport_template * | 183 | extern struct scsi_transport_template * |
