[SCSI] lpfc 8.3.34: Correct typecasts for snprintf messages

[deliverable/linux.git] / drivers / scsi / lpfc / lpfc_ct.c

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 93e96b3c9097aff51694c6f7cc6f35dd695deead..7ffabb7e3afa536cb42f6aef511e80979ddb17c6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -104,7 +104,8 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        if (unlikely(icmd->ulpStatus == IOSTAT_NEED_BUFFER)) {
                lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
        } else if ((icmd->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-               ((icmd->un.ulpWord[4] & 0xff) == IOERR_RCV_BUFFER_WAITING)) {
+                  ((icmd->un.ulpWord[4] & IOERR_PARAM_MASK) ==
+                  IOERR_RCV_BUFFER_WAITING)) {
                /* Not enough posted buffers; Try posting more buffers */
                phba->fc_stat.NoRcvBuf++;
                if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))
@@ -633,7 +634,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                /* Check for retry */
                if (vport->fc_ns_retry < LPFC_MAX_NS_RETRY) {
                        if (irsp->ulpStatus != IOSTAT_LOCAL_REJECT ||
-                           irsp->un.ulpWord[4] != IOERR_NO_RESOURCES)
+                           (irsp->un.ulpWord[4] && IOERR_PARAM_MASK) !=
+                           IOERR_NO_RESOURCES)
                                vport->fc_ns_retry++;
 
                        /* CT command is being retried */
@@ -783,7 +785,9 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                if (cmdiocb->retry < LPFC_MAX_NS_RETRY) {
                        retry = 1;
                        if (irsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
-                               switch (irsp->un.ulpWord[4]) {
+                               switch ((irsp->un.ulpWord[4] &
+                                       IOERR_PARAM_MASK)) {
+
                                case IOERR_NO_RESOURCES:
                                        /* We don't increment the retry
                                         * count for this case.
@@ -908,8 +912,10 @@ lpfc_cmpl_ct(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                 cmdcode, irsp->ulpStatus, irsp->un.ulpWord[4]);
 
                if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-                       ((irsp->un.ulpWord[4] == IOERR_SLI_DOWN) ||
-                        (irsp->un.ulpWord[4] == IOERR_SLI_ABORTED)))
+                       (((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) ==
+                         IOERR_SLI_DOWN) ||
+                        ((irsp->un.ulpWord[4] & IOERR_PARAM_MASK) ==
+                         IOERR_SLI_ABORTED)))
                        goto out;
 
                retry = cmdiocb->retry;