[SCSI] scsi_transport_sas: mapping the rphy channel equal to the port identifier

We will be mapping the RAID volumes in mptsas to a reserved
channel that
is one larger than the anticapated number of ports on the direct
attached host
adapter.

Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index fb6641b42dfa..a3e0b7bc2d7b 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -638,7 +638,7 @@ int sas_rphy_add(struct sas_rphy *rphy)
         mutex_unlock(&sas_host->lock);
 
         if (rphy->scsi_target_id != -1) {
-                scsi_scan_target(&rphy->dev, parent->number,
+                scsi_scan_target(&rphy->dev, parent->port_identifier,
                                 rphy->scsi_target_id, ~0, 0);
         }
 
@@ -745,9 +745,9 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,
                 if (rphy->scsi_target_id == -1)
                         continue;
 
-                if ((channel == SCAN_WILD_CARD || channel == parent->number) &&
+                if ((channel == SCAN_WILD_CARD || channel == parent->port_identifier) &&
                     (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) {
-                        scsi_scan_target(&rphy->dev, parent->number,
+                        scsi_scan_target(&rphy->dev, parent->port_identifier,
                                          rphy->scsi_target_id, lun, 1);
                 }
         }