Merge remote-tracking branch 'scsi/for-next'

[deliverable/linux.git] / drivers / scsi / be2iscsi / be.h

diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
index ee5ace87353580b9005341e9442d5797a2fb4f18..b1d0fdc5d5e106dee779bb5c676142dfddb80e20 100644 (file)
--- a/drivers/scsi/be2iscsi/be.h
+++ b/drivers/scsi/be2iscsi/be.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2005 - 2015 Emulex
+ * Copyright (C) 2005 - 2016 Broadcom
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,7 +8,7 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@avagotech.com
+ * linux-drivers@broadcom.com
  *
  * Emulex
  * 3333 Susan Street
@@ -89,7 +89,7 @@ struct be_aic_obj {           /* Adaptive interrupt coalescing (AIC) info */
        u32 max_eqd;            /* in usecs */
        u32 prev_eqd;           /* in usecs */
        u32 et_eqd;             /* configured val when aic is off */
-       ulong jiffs;
+       ulong jiffies;
        u64 eq_prev;            /* Used to calculate eqe */
 };
 
@@ -100,7 +100,7 @@ struct be_eq_obj {
        struct be_queue_info q;
        struct beiscsi_hba *phba;
        struct be_queue_info *cq;
-       struct work_struct work_cqs; /* Work Item */
+       struct work_struct mcc_work; /* Work Item */
        struct irq_poll iopoll;
 };
 
@@ -111,8 +111,11 @@ struct be_mcc_obj {
 
 struct beiscsi_mcc_tag_state {
        unsigned long tag_state;
-#define MCC_TAG_STATE_RUNNING  1
-#define MCC_TAG_STATE_TIMEOUT  2
+#define MCC_TAG_STATE_RUNNING  0
+#define MCC_TAG_STATE_TIMEOUT  1
+#define MCC_TAG_STATE_ASYNC    2
+#define MCC_TAG_STATE_IGNORE   3
+       void (*cbfn)(struct beiscsi_hba *, unsigned int);
        struct be_dma_mem tag_mem_state;
 };