1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index aa10f7951634..1cc23a69db5e 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -109,7 +109,8 @@ struct hbq_dmabuf {
         struct lpfc_dmabuf dbuf;
         uint32_t size;
         uint32_t tag;
-        struct lpfc_rcqe rcqe;
+        struct lpfc_cq_event cq_event;
+        unsigned long time_stamp;
 };
 
 /* Priority bit.  Set value to exceed low water mark in lpfc_mem. */
@@ -201,6 +202,7 @@ struct lpfc_stats {
         uint32_t elsRcvLIRR;
         uint32_t elsRcvRPS;
         uint32_t elsRcvRPL;
+        uint32_t elsRcvRRQ;
         uint32_t elsXmitFLOGI;
         uint32_t elsXmitFDISC;
         uint32_t elsXmitPLOGI;
@@ -289,8 +291,8 @@ struct lpfc_vport {
 
         uint16_t vpi;
         uint16_t vfi;
-        uint8_t vfi_state;
-#define LPFC_VFI_REGISTERED     0x1
+        uint8_t vpi_state;
+#define LPFC_VPI_REGISTERED     0x1
 
         uint32_t fc_flag;       /* FC flags */
 /* Several of these flags are HBA centric and should be moved to
@@ -405,6 +407,7 @@ struct lpfc_vport {
         uint8_t stat_data_enabled;
         uint8_t stat_data_blocked;
         struct list_head rcv_buffer_list;
+        unsigned long rcv_buffer_time_stamp;
         uint32_t vport_flag;
 #define STATIC_VPORT    1
 };
@@ -527,13 +530,16 @@ struct lpfc_hba {
 #define HBA_ERATT_HANDLED       0x1 /* This flag is set when eratt handled */
 #define DEFER_ERATT             0x2 /* Deferred error attention in progress */
 #define HBA_FCOE_SUPPORT        0x4 /* HBA function supports FCOE */
-#define HBA_RECEIVE_BUFFER      0x8 /* Rcv buffer posted to worker thread */
+#define HBA_SP_QUEUE_EVT        0x8 /* Slow-path qevt posted to worker thread*/
 #define HBA_POST_RECEIVE_BUFFER 0x10 /* Rcv buffers need to be posted */
 #define FCP_XRI_ABORT_EVENT     0x20
 #define ELS_XRI_ABORT_EVENT     0x40
 #define ASYNC_EVENT             0x80
 #define LINK_DISABLED           0x100 /* Link disabled by user */
 #define FCF_DISC_INPROGRESS     0x200 /* FCF discovery in progress */
+#define HBA_FIP_SUPPORT         0x400 /* FIP support in HBA */
+#define HBA_AER_ENABLED         0x800 /* AER enabled with HBA */
+        uint32_t fcp_ring_in_use; /* When polling test if intr-hndlr active*/
         struct lpfc_dmabuf slim2p;
 
         MAILBOX_t *mbox;
@@ -551,6 +557,7 @@ struct lpfc_hba {
         uint8_t fc_linkspeed;   /* Link speed after last READ_LA */
 
         uint32_t fc_eventTag;   /* event tag for link attention */
+        uint32_t link_events;
 
         /* These fields used to be binfo */
         uint32_t fc_pref_DID;   /* preferred D_ID */
@@ -604,8 +611,8 @@ struct lpfc_hba {
         uint32_t cfg_enable_hba_reset;
         uint32_t cfg_enable_hba_heartbeat;
         uint32_t cfg_enable_bg;
-        uint32_t cfg_enable_fip;
         uint32_t cfg_log_verbose;
+        uint32_t cfg_aer_support;
 
         lpfc_vpd_t vpd;         /* vital product data */