|
@@ -313,8 +313,7 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
|
|
ndlp->nlp_state, ndlp->nlp_rpi);
|
|
ndlp->nlp_state, ndlp->nlp_rpi);
|
|
}
|
|
}
|
|
|
|
|
|
- if (!(vport->load_flag & FC_UNLOADING) &&
|
|
|
|
- !(ndlp->nlp_flag & NLP_DELAY_TMO) &&
|
|
|
|
|
|
+ if (!(ndlp->nlp_flag & NLP_DELAY_TMO) &&
|
|
!(ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
|
|
!(ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
|
|
(ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
|
|
(ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
|
|
(ndlp->nlp_state != NLP_STE_REG_LOGIN_ISSUE) &&
|
|
(ndlp->nlp_state != NLP_STE_REG_LOGIN_ISSUE) &&
|
|
@@ -2175,7 +2174,7 @@ lpfc_mbx_cmpl_fcf_scan_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
|
|
uint32_t boot_flag, addr_mode;
|
|
uint32_t boot_flag, addr_mode;
|
|
uint16_t fcf_index, next_fcf_index;
|
|
uint16_t fcf_index, next_fcf_index;
|
|
struct lpfc_fcf_rec *fcf_rec = NULL;
|
|
struct lpfc_fcf_rec *fcf_rec = NULL;
|
|
- uint16_t vlan_id;
|
|
|
|
|
|
+ uint16_t vlan_id = LPFC_FCOE_NULL_VID;
|
|
bool select_new_fcf;
|
|
bool select_new_fcf;
|
|
int rc;
|
|
int rc;
|
|
|
|
|
|
@@ -4022,9 +4021,11 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
|
|
rdata = rport->dd_data;
|
|
rdata = rport->dd_data;
|
|
/* break the link before dropping the ref */
|
|
/* break the link before dropping the ref */
|
|
ndlp->rport = NULL;
|
|
ndlp->rport = NULL;
|
|
- if (rdata && rdata->pnode == ndlp)
|
|
|
|
- lpfc_nlp_put(ndlp);
|
|
|
|
- rdata->pnode = NULL;
|
|
|
|
|
|
+ if (rdata) {
|
|
|
|
+ if (rdata->pnode == ndlp)
|
|
|
|
+ lpfc_nlp_put(ndlp);
|
|
|
|
+ rdata->pnode = NULL;
|
|
|
|
+ }
|
|
/* drop reference for earlier registeration */
|
|
/* drop reference for earlier registeration */
|
|
put_device(&rport->dev);
|
|
put_device(&rport->dev);
|
|
}
|
|
}
|
|
@@ -4607,9 +4608,9 @@ lpfc_sli4_dequeue_nport_iocbs(struct lpfc_hba *phba,
|
|
pring = qp->pring;
|
|
pring = qp->pring;
|
|
if (!pring)
|
|
if (!pring)
|
|
continue;
|
|
continue;
|
|
- spin_lock_irq(&pring->ring_lock);
|
|
|
|
|
|
+ spin_lock(&pring->ring_lock);
|
|
__lpfc_dequeue_nport_iocbs(phba, ndlp, pring, dequeue_list);
|
|
__lpfc_dequeue_nport_iocbs(phba, ndlp, pring, dequeue_list);
|
|
- spin_unlock_irq(&pring->ring_lock);
|
|
|
|
|
|
+ spin_unlock(&pring->ring_lock);
|
|
}
|
|
}
|
|
spin_unlock_irq(&phba->hbalock);
|
|
spin_unlock_irq(&phba->hbalock);
|
|
}
|
|
}
|