aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/scsi_sas_internal.h2
-rw-r--r--drivers/scsi/scsi_transport_sas.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h
index 6266a5d73d0f..e659912498bd 100644
--- a/drivers/scsi/scsi_sas_internal.h
+++ b/drivers/scsi/scsi_sas_internal.h
@@ -4,7 +4,7 @@
4#define SAS_HOST_ATTRS 0 4#define SAS_HOST_ATTRS 0
5#define SAS_PHY_ATTRS 17 5#define SAS_PHY_ATTRS 17
6#define SAS_PORT_ATTRS 1 6#define SAS_PORT_ATTRS 1
7#define SAS_RPORT_ATTRS 7 7#define SAS_RPORT_ATTRS 8
8#define SAS_END_DEV_ATTRS 5 8#define SAS_END_DEV_ATTRS 5
9#define SAS_EXPANDER_ATTRS 7 9#define SAS_EXPANDER_ATTRS 7
10 10
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 80520e2f0fa2..b6f958193dad 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -1286,6 +1286,7 @@ sas_rphy_protocol_attr(identify.target_port_protocols, target_port_protocols);
1286sas_rphy_simple_attr(identify.sas_address, sas_address, "0x%016llx\n", 1286sas_rphy_simple_attr(identify.sas_address, sas_address, "0x%016llx\n",
1287 unsigned long long); 1287 unsigned long long);
1288sas_rphy_simple_attr(identify.phy_identifier, phy_identifier, "%d\n", u8); 1288sas_rphy_simple_attr(identify.phy_identifier, phy_identifier, "%d\n", u8);
1289sas_rphy_simple_attr(scsi_target_id, scsi_target_id, "%d\n", u32);
1289 1290
1290/* only need 8 bytes of data plus header (4 or 8) */ 1291/* only need 8 bytes of data plus header (4 or 8) */
1291#define BUF_SIZE 64 1292#define BUF_SIZE 64
@@ -1886,6 +1887,7 @@ sas_attach_transport(struct sas_function_template *ft)
1886 SETUP_RPORT_ATTRIBUTE(rphy_device_type); 1887 SETUP_RPORT_ATTRIBUTE(rphy_device_type);
1887 SETUP_RPORT_ATTRIBUTE(rphy_sas_address); 1888 SETUP_RPORT_ATTRIBUTE(rphy_sas_address);
1888 SETUP_RPORT_ATTRIBUTE(rphy_phy_identifier); 1889 SETUP_RPORT_ATTRIBUTE(rphy_phy_identifier);
1890 SETUP_RPORT_ATTRIBUTE(rphy_scsi_target_id);
1889 SETUP_OPTIONAL_RPORT_ATTRIBUTE(rphy_enclosure_identifier, 1891 SETUP_OPTIONAL_RPORT_ATTRIBUTE(rphy_enclosure_identifier,
1890 get_enclosure_identifier); 1892 get_enclosure_identifier);
1891 SETUP_OPTIONAL_RPORT_ATTRIBUTE(rphy_bay_identifier, 1893 SETUP_OPTIONAL_RPORT_ATTRIBUTE(rphy_bay_identifier,