Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / bnx2fc / bnx2fc.h

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 2f1bea42336f88cc2d48eb0600efd918333fc6c6..3486845ba301b095525f25ba26de0e809bf27ef9 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -60,10 +60,11 @@
 
 #include "57xx_hsi_bnx2fc.h"
 #include "../../net/ethernet/broadcom/cnic_if.h"
+#include  "../../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h"
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME            "bnx2fc"
-#define BNX2FC_VERSION         "1.0.11"
+#define BNX2FC_VERSION         "1.0.12"
 
 #define PFX                    "bnx2fc: "
 
@@ -85,6 +86,8 @@
 #define BNX2FC_NUM_MAX_SESS    1024
 #define BNX2FC_NUM_MAX_SESS_LOG        (ilog2(BNX2FC_NUM_MAX_SESS))
 
+#define BNX2FC_MAX_NPIV                256
+
 #define BNX2FC_MAX_OUTSTANDING_CMNDS   2048
 #define BNX2FC_CAN_QUEUE               BNX2FC_MAX_OUTSTANDING_CMNDS
 #define BNX2FC_ELSTM_XIDS              BNX2FC_CAN_QUEUE
@@ -207,6 +210,7 @@ struct bnx2fc_hba {
        struct fcoe_statistics_params *stats_buffer;
        dma_addr_t stats_buf_dma;
        struct completion stat_req_done;
+       struct fcoe_capabilities fcoe_cap;
 
        /*destroy handling */
        struct timer_list destroy_timer;
@@ -275,6 +279,7 @@ struct bnx2fc_rport {
 #define BNX2FC_FLAG_CTX_ALLOC_FAILURE  0x6
 #define BNX2FC_FLAG_UPLD_REQ_COMPL     0x7
 #define BNX2FC_FLAG_EXPL_LOGO          0x8
+#define BNX2FC_FLAG_DISABLE_FAILED     0x9
 
        u8 src_addr[ETH_ALEN];
        u32 max_sqes;