diff options
author | James Smart <james.smart@avagotech.com> | 2015-05-21 13:55:29 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-06-06 01:41:14 -0400 |
commit | f818ea7ad46222526bcaa3b04208775f371dc03c (patch) | |
tree | 16b7ed93158c44d23fca868321a326f001615650 | |
parent | 466e840b7809e00ab3a1af9b4a5b5751e681730d (diff) |
lpfc: Fix incorrect log message reported for empty FCF record.
Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: James Smart <james.smart@avagotech.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_hbadisc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 88af258147d0..72a69d44c2b2 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
@@ -1777,7 +1777,7 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, | |||
1777 | dma_addr_t phys_addr; | 1777 | dma_addr_t phys_addr; |
1778 | struct lpfc_mbx_sge sge; | 1778 | struct lpfc_mbx_sge sge; |
1779 | struct lpfc_mbx_read_fcf_tbl *read_fcf; | 1779 | struct lpfc_mbx_read_fcf_tbl *read_fcf; |
1780 | uint32_t shdr_status, shdr_add_status; | 1780 | uint32_t shdr_status, shdr_add_status, if_type; |
1781 | union lpfc_sli4_cfg_shdr *shdr; | 1781 | union lpfc_sli4_cfg_shdr *shdr; |
1782 | struct fcf_record *new_fcf_record; | 1782 | struct fcf_record *new_fcf_record; |
1783 | 1783 | ||
@@ -1798,9 +1798,11 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, | |||
1798 | lpfc_sli_pcimem_bcopy(shdr, shdr, | 1798 | lpfc_sli_pcimem_bcopy(shdr, shdr, |
1799 | sizeof(union lpfc_sli4_cfg_shdr)); | 1799 | sizeof(union lpfc_sli4_cfg_shdr)); |
1800 | shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response); | 1800 | shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response); |
1801 | if_type = bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf); | ||
1801 | shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response); | 1802 | shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response); |
1802 | if (shdr_status || shdr_add_status) { | 1803 | if (shdr_status || shdr_add_status) { |
1803 | if (shdr_status == STATUS_FCF_TABLE_EMPTY) | 1804 | if (shdr_status == STATUS_FCF_TABLE_EMPTY || |
1805 | if_type == LPFC_SLI_INTF_IF_TYPE_2) | ||
1804 | lpfc_printf_log(phba, KERN_ERR, LOG_FIP, | 1806 | lpfc_printf_log(phba, KERN_ERR, LOG_FIP, |
1805 | "2726 READ_FCF_RECORD Indicates empty " | 1807 | "2726 READ_FCF_RECORD Indicates empty " |
1806 | "FCF table.\n"); | 1808 | "FCF table.\n"); |