[SCSI] lpfc 8.1.12 : Collapse discovery lists to a single node list

Collapse discovery lists to a single node list.

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 0 insertions, 20 deletions

diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index 4561327c9946..971b0f80ca7f 100644
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -83,15 +83,6 @@ struct lpfc_nodelist {
 };
 
 /* Defines for nlp_flag (uint32) */
-#define NLP_UNUSED_LIST    0x1          /* Flg to indicate node will be freed */
-#define NLP_PLOGI_LIST     0x2          /* Flg to indicate sent PLOGI */
-#define NLP_ADISC_LIST     0x3          /* Flg to indicate sent ADISC */
-#define NLP_REGLOGIN_LIST  0x4          /* Flg to indicate sent REG_LOGIN */
-#define NLP_PRLI_LIST      0x5          /* Flg to indicate sent PRLI */
-#define NLP_UNMAPPED_LIST  0x6          /* Node is now unmapped */
-#define NLP_MAPPED_LIST    0x7          /* Node is now mapped */
-#define NLP_NPR_LIST       0x8          /* Node is in NPort Recovery state */
-#define NLP_LIST_MASK      0xf          /* mask to see what list node is on */
 #define NLP_PLOGI_SND      0x20         /* sent PLOGI request for this entry */
 #define NLP_PRLI_SND       0x40         /* sent PRLI request for this entry */
 #define NLP_ADISC_SND      0x80         /* sent ADISC request for this entry */
@@ -109,17 +100,6 @@ struct lpfc_nodelist {
                                            NPR list */
 #define NLP_NODEV_REMOVE   0x8000000    /* Defer removal till discovery ends */
 
-/* Defines for list searchs */
-#define NLP_SEARCH_MAPPED    0x1        /* search mapped */
-#define NLP_SEARCH_UNMAPPED  0x2        /* search unmapped */
-#define NLP_SEARCH_PLOGI     0x4        /* search plogi */
-#define NLP_SEARCH_ADISC     0x8        /* search adisc */
-#define NLP_SEARCH_REGLOGIN  0x10       /* search reglogin */
-#define NLP_SEARCH_PRLI      0x20       /* search prli */
-#define NLP_SEARCH_NPR       0x40       /* search npr */
-#define NLP_SEARCH_UNUSED    0x80       /* search mapped */
-#define NLP_SEARCH_ALL       0xff       /* search all lists */
-
 /* There are 4 different double linked lists nodelist entries can reside on.
  * The Port Login (PLOGI) list and Address Discovery (ADISC) list are used
  * when Link Up discovery or Registered State Change Notification (RSCN)