1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 746dd3d7a092..b64c6da870d3 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -325,6 +325,7 @@ struct lpfc_vport {
 #define FC_VPORT_CVL_RCVD       0x400000 /* VLink failed due to CVL      */
 #define FC_VFI_REGISTERED       0x800000 /* VFI is registered */
 #define FC_FDISC_COMPLETED      0x1000000/* FDISC completed */
+#define FC_DISC_DELAYED         0x2000000/* Delay NPort discovery */
 
         uint32_t ct_flags;
 #define FC_CT_RFF_ID            0x1      /* RFF_ID accepted by switch */
@@ -348,6 +349,8 @@ struct lpfc_vport {
 
         uint32_t fc_myDID;      /* fibre channel S_ID */
         uint32_t fc_prevDID;    /* previous fibre channel S_ID */
+        struct lpfc_name fabric_portname;
+        struct lpfc_name fabric_nodename;
 
         int32_t stopped;   /* HBA has not been restarted since last ERATT */
         uint8_t fc_linkspeed;   /* Link speed after last READ_LA */
@@ -372,6 +375,7 @@ struct lpfc_vport {
 #define WORKER_DISC_TMO                0x1      /* vport: Discovery timeout */
 #define WORKER_ELS_TMO                 0x2      /* vport: ELS timeout */
 #define WORKER_FDMI_TMO                0x4      /* vport: FDMI timeout */
+#define WORKER_DELAYED_DISC_TMO        0x8      /* vport: delayed discovery */
 
 #define WORKER_MBOX_TMO                0x100    /* hba: MBOX timeout */
 #define WORKER_HB_TMO                  0x200    /* hba: Heart beat timeout */
@@ -382,6 +386,7 @@ struct lpfc_vport {
 
         struct timer_list fc_fdmitmo;
         struct timer_list els_tmofunc;
+        struct timer_list delayed_disc_tmo;
 
         int unreg_vpi_cmpl;
 
@@ -548,6 +553,8 @@ struct lpfc_hba {
 #define LPFC_SLI3_CRP_ENABLED           0x08
 #define LPFC_SLI3_BG_ENABLED            0x20
 #define LPFC_SLI3_DSS_ENABLED           0x40
+#define LPFC_SLI4_PERFH_ENABLED         0x80
+#define LPFC_SLI4_PHWQ_ENABLED          0x100
         uint32_t iocb_cmd_size;
         uint32_t iocb_rsp_size;
 
@@ -655,7 +662,7 @@ struct lpfc_hba {
 #define LPFC_INITIALIZE_LINK              0     /* do normal init_link mbox */
 #define LPFC_DELAY_INIT_LINK              1     /* layered driver hold off */
 #define LPFC_DELAY_INIT_LINK_INDEFINITELY 2     /* wait, manual intervention */
-
+        uint32_t cfg_enable_dss;
         lpfc_vpd_t vpd;         /* vital product data */
 
         struct pci_dev *pcidev;
@@ -792,6 +799,10 @@ struct lpfc_hba {
         struct dentry *debug_slow_ring_trc;
         struct lpfc_debugfs_trc *slow_ring_trc;
         atomic_t slow_ring_trc_cnt;
+        /* iDiag debugfs sub-directory */
+        struct dentry *idiag_root;
+        struct dentry *idiag_pci_cfg;
+        struct dentry *idiag_que_info;
 #endif
 
         /* Used for deferred freeing of ELS data buffers */