diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2011-05-04 18:22:33 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:04:46 -0700 |
| commit | d7b90fc3436fa6d5b5251eec3128386af1a4d7b8 (patch) | |
| tree | cfaf1edede969b86d1b88a396eba97bde2432123 /drivers/scsi/isci/port.c | |
| parent | f700ad4331d55df729a36b2602c4abe2d855036f (diff) | |
| download | kernel_samsung_smdk4412-d7b90fc3436fa6d5b5251eec3128386af1a4d7b8.zip kernel_samsung_smdk4412-d7b90fc3436fa6d5b5251eec3128386af1a4d7b8.tar.gz kernel_samsung_smdk4412-d7b90fc3436fa6d5b5251eec3128386af1a4d7b8.tar.bz2 | |
isci: fixup SAS iaf protocols data structure
Moved the actual data structure that's read from the phy register to phy
header. Removed the parsing of identify address frame protocol bits as
that seemed not necessary and we can use existing information.
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/port.c')
| -rw-r--r-- | drivers/scsi/isci/port.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c index 96a2002..2decafb 100644 --- a/drivers/scsi/isci/port.c +++ b/drivers/scsi/isci/port.c @@ -187,7 +187,7 @@ void isci_port_link_up( scic_port_get_properties(port, &properties); - if (properties.remote.protocols.u.bits.stp_target) { + if (phy->protocol == SCIC_SDS_PHY_PROTOCOL_SATA) { u64 attached_sas_address; isci_phy->sas_phy.oob_mode = SATA_OOB_MODE; @@ -207,9 +207,7 @@ void isci_port_link_up( memcpy(&isci_phy->sas_phy.attached_sas_addr, &attached_sas_address, sizeof(attached_sas_address)); - - } else if (properties.remote.protocols.u.bits.ssp_target || - properties.remote.protocols.u.bits.smp_target) { + } else if (phy->protocol == SCIC_SDS_PHY_PROTOCOL_SAS) { isci_phy->sas_phy.oob_mode = SAS_OOB_MODE; isci_phy->sas_phy.frame_rcvd_size = sizeof(struct sas_identify_frame); |