aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_nportdisc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_nportdisc.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_nportdisc.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index e7470a4738c5..45dc0210fc49 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,27 +1,24 @@
1/******************************************************************* 1/*******************************************************************
2 * This file is part of the Emulex Linux Device Driver for * 2 * This file is part of the Emulex Linux Device Driver for *
3 * Enterprise Fibre Channel Host Bus Adapters. * 3 * Fibre Channel Host Bus Adapters. *
4 * Refer to the README file included with this package for * 4 * Copyright (C) 2004-2005 Emulex. All rights reserved. *
5 * driver version and adapter support. * 5 * EMULEX and SLI are trademarks of Emulex. *
6 * Copyright (C) 2004 Emulex Corporation. *
7 * www.emulex.com * 6 * www.emulex.com *
7 * Portions Copyright (C) 2004-2005 Christoph Hellwig *
8 * * 8 * *
9 * This program is free software; you can redistribute it and/or * 9 * This program is free software; you can redistribute it and/or *
10 * modify it under the terms of the GNU General Public License * 10 * modify it under the terms of version 2 of the GNU General *
11 * as published by the Free Software Foundation; either version 2 * 11 * Public License as published by the Free Software Foundation. *
12 * of the License, or (at your option) any later version. * 12 * This program is distributed in the hope that it will be useful. *
13 * * 13 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND *
14 * This program is distributed in the hope that it will be useful, * 14 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, *
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE *
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *
17 * GNU General Public License for more details, a copy of which * 17 * TO BE LEGALLY INVALID. See the GNU General Public License for *
18 * can be found in the file COPYING included with this package. * 18 * more details, a copy of which can be found in the file COPYING *
19 * included with this package. *
19 *******************************************************************/ 20 *******************************************************************/
20 21
21/*
22 * $Id: lpfc_nportdisc.c 1.179 2005/04/13 11:59:13EDT sf_support Exp $
23 */
24
25#include <linux/blkdev.h> 22#include <linux/blkdev.h>
26#include <linux/pci.h> 23#include <linux/pci.h>
27#include <linux/interrupt.h> 24#include <linux/interrupt.h>
@@ -950,8 +947,13 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
950 lpfc_unreg_rpi(phba, ndlp); 947 lpfc_unreg_rpi(phba, ndlp);
951 return (ndlp->nlp_state); 948 return (ndlp->nlp_state);
952 } 949 }
953 ndlp->nlp_state = NLP_STE_MAPPED_NODE; 950 if (ndlp->nlp_type & NLP_FCP_TARGET) {
954 lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST); 951 ndlp->nlp_state = NLP_STE_MAPPED_NODE;
952 lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
953 } else {
954 ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
955 lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
956 }
955 return (ndlp->nlp_state); 957 return (ndlp->nlp_state);
956} 958}
957 959