linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / lpfc / lpfc_disc.h

diff --git a/drivers/scsi/lpfc/lpfc_disc.h b/drivers/scsi/lpfc/lpfc_disc.h
index 41cf5d3..ed6c816 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_disc.h
+++ b/drivers/scsi/lpfc/lpfc_disc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2005 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -28,24 +28,18 @@
  * This is used by Fibre Channel protocol to support FCP.
  */
 
-/* worker thread events */
-enum lpfc_work_type {
-       LPFC_EVT_NODEV_TMO,
-       LPFC_EVT_ONLINE,
-       LPFC_EVT_OFFLINE,
-       LPFC_EVT_WARM_START,
-       LPFC_EVT_KILL,
-       LPFC_EVT_ELS_RETRY,
-};
-
 /* structure used to queue event to the discovery tasklet */
 struct lpfc_work_evt {
        struct list_head      evt_listp;
        void                * evt_arg1;
        void                * evt_arg2;
-       enum lpfc_work_type   evt;
+       uint32_t              evt;
 };
 
+#define LPFC_EVT_NODEV_TMO     0x1
+#define LPFC_EVT_ONLINE                0x2
+#define LPFC_EVT_OFFLINE       0x3
+#define LPFC_EVT_ELS_RETRY     0x4
 
 struct lpfc_nodelist {
        struct list_head nlp_listp;
@@ -62,7 +56,6 @@ struct lpfc_nodelist {
 
        uint16_t        nlp_rpi;
        uint16_t        nlp_state;              /* state transition indicator */
-       uint16_t        nlp_prev_state;         /* state transition indicator */
        uint16_t        nlp_xri;                /* output exchange id for RPI */
        uint16_t        nlp_sid;                /* scsi id */
 #define NLP_NO_SID             0xffff
@@ -113,7 +106,6 @@ struct lpfc_nodelist {
 #define NLP_NPR_ADISC      0x2000000   /* Issue ADISC when dq'ed from
                                           NPR list */
 #define NLP_DELAY_REMOVE   0x4000000   /* Defer removal till end of DSM */
-#define NLP_NODEV_REMOVE   0x8000000   /* Defer removal till discovery ends */
 
 /* Defines for list searchs */
 #define NLP_SEARCH_MAPPED    0x1       /* search mapped */