lpfc: Fix RDP Speed reporting.

BugLink: http://bugs.launchpad.net/bugs/1541592
Fix RDP Speed reporting.

Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: James Smart <james.smart@avagotech.com>
Reviewed-by: Hannes Reinicke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 81e7517723fc17396ba91f59312b3177266ddbda)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 3394648d80ff951a271159d48e72f46b769223c3..f7a29676dc75ecdf362ba5ec9b7637b54cff447f 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -4730,28 +4730,25 @@ lpfc_rdp_res_speed(struct fc_rdp_port_speed_desc *desc, struct lpfc_hba *phba)
 
        desc->tag = cpu_to_be32(RDP_PORT_SPEED_DESC_TAG);
 
-       switch (phba->sli4_hba.link_state.speed) {
-       case LPFC_FC_LA_SPEED_1G:
+       switch (phba->fc_linkspeed) {
+       case LPFC_LINK_SPEED_1GHZ:
                rdp_speed = RDP_PS_1GB;
                break;
-       case LPFC_FC_LA_SPEED_2G:
+       case LPFC_LINK_SPEED_2GHZ:
                rdp_speed = RDP_PS_2GB;
                break;
-       case LPFC_FC_LA_SPEED_4G:
+       case LPFC_LINK_SPEED_4GHZ:
                rdp_speed = RDP_PS_4GB;
                break;
-       case LPFC_FC_LA_SPEED_8G:
+       case LPFC_LINK_SPEED_8GHZ:
                rdp_speed = RDP_PS_8GB;
                break;
-       case LPFC_FC_LA_SPEED_10G:
+       case LPFC_LINK_SPEED_10GHZ:
                rdp_speed = RDP_PS_10GB;
                break;
-       case LPFC_FC_LA_SPEED_16G:
+       case LPFC_LINK_SPEED_16GHZ:
                rdp_speed = RDP_PS_16GB;
                break;
-       case LPFC_FC_LA_SPEED_32G:
-               rdp_speed = RDP_PS_32GB;
-               break;
        default:
                rdp_speed = RDP_PS_UNKNOWN;
                break;