| From 5ed87df593cdbb140123d01b291f88cc9091f476 Mon Sep 17 00:00:00 2001 |
| From: James Smart <james.smart@avagotech.com> |
| Date: Wed, 16 Dec 2015 18:11:59 -0500 |
| Subject: [PATCH 054/135] lpfc: Fix RDP Speed reporting. |
| |
| [ Upstream commit 81e7517723fc17396ba91f59312b3177266ddbda ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/scsi/lpfc/lpfc_els.c | 17 +++++++---------- |
| 1 file changed, 7 insertions(+), 10 deletions(-) |
| |
| --- a/drivers/scsi/lpfc/lpfc_els.c |
| +++ b/drivers/scsi/lpfc/lpfc_els.c |
| @@ -4698,28 +4698,25 @@ lpfc_rdp_res_speed(struct fc_rdp_port_sp |
| |
| 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; |
