summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_nportdisc.c
diff options
context:
space:
mode:
authorJames Smart2006-12-02 19:33:57 +0100
committerJames Bottomley2006-12-03 16:28:43 +0100
commit2fb9bd8b9cbe9a8d70bf5f43a9ee6a4fa565ed5a (patch)
treeb16c87c100f7645f3872213f8e1203505dcbc4de /drivers/scsi/lpfc/lpfc_nportdisc.c
parent[SCSI] scsi tgt: IBM eServer i/pSeries virtual SCSI target driver (diff)
downloadkernel-qcow2-linux-2fb9bd8b9cbe9a8d70bf5f43a9ee6a4fa565ed5a.tar.gz
kernel-qcow2-linux-2fb9bd8b9cbe9a8d70bf5f43a9ee6a4fa565ed5a.tar.xz
kernel-qcow2-linux-2fb9bd8b9cbe9a8d70bf5f43a9ee6a4fa565ed5a.zip
[SCSI] lpfc 8.1.11 : Discovery Fixes
Discovery Fixes: - Prevent starting discovery of a node if discovery is in progress. - Code improvement (reduction) for lpfc_findnode_did(). - Update discovery to send RFF to Fabric on link up - Bypass unique WWN checks for fabric addresses - Add ndlp to plogi list prior to issuing the plogi els command Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_nportdisc.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_nportdisc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index d5f415007db2..958c330ecaad 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1620,8 +1620,8 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba,
* or discovery in progress for this node. Starting discovery
* here will affect the counting of discovery threads.
*/
- if ((!(ndlp->nlp_flag & NLP_DELAY_TMO)) &&
- (ndlp->nlp_flag & NLP_NPR_2B_DISC)){
+ if (!(ndlp->nlp_flag & NLP_DELAY_TMO) &&
+ !(ndlp->nlp_flag & NLP_NPR_2B_DISC)){
if (ndlp->nlp_flag & NLP_NPR_ADISC) {
ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
ndlp->nlp_state = NLP_STE_ADISC_ISSUE;