summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_hbadisc.c
diff options
context:
space:
mode:
authorJames Smart <james.smart@emulex.com>2012-01-18 16:25:25 -0500
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 08:08:53 -0600
commiteff4a01b6e9f8cee3c541ab7f2ad18b5bbffd124 (patch)
treef77ae41ac94f3bdc6cfde5fb5847f807c1f257ae /drivers/scsi/lpfc/lpfc_hbadisc.c
parentacd6859b084d1e1b3ec8bc9befe6532223260d33 (diff)
downloadlinux-eff4a01b6e9f8cee3c541ab7f2ad18b5bbffd124.tar.gz
linux-eff4a01b6e9f8cee3c541ab7f2ad18b5bbffd124.tar.bz2
linux-eff4a01b6e9f8cee3c541ab7f2ad18b5bbffd124.zip
[SCSI] lpfc 8.3.29: FC Discovery state machine fixes
FC Discovery state machine fixes. - Fix bug with driver returning the inactive ndlp (125743) - Fix discovery problem when in pt2pt by copying old ndlp state before state change (126887) - Fix ndlp nodelist not empty wait timeout during driver unloading (127052) Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com> Signed-off-by: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_hbadisc.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_hbadisc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 678a4b11059c..2cadb8271f10 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -5332,6 +5332,10 @@ lpfc_filter_by_rpi(struct lpfc_nodelist *ndlp, void *param)
{
uint16_t *rpi = param;
+ /* check for active node */
+ if (!NLP_CHK_NODE_ACT(ndlp))
+ return 0;
+
return ndlp->nlp_rpi == *rpi;
}