diff options
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
-rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 342ab58b14b..cfc25cf064d 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * (you will need to reboot afterwards) */ | 20 | * (you will need to reboot afterwards) */ |
21 | /* #define BNX2X_STOP_ON_ERROR */ | 21 | /* #define BNX2X_STOP_ON_ERROR */ |
22 | 22 | ||
23 | #define DRV_MODULE_VERSION "1.60.00-5" | 23 | #define DRV_MODULE_VERSION "1.60.00-6" |
24 | #define DRV_MODULE_RELDATE "2010/11/24" | 24 | #define DRV_MODULE_RELDATE "2010/11/29" |
25 | #define BNX2X_BC_VER 0x040200 | 25 | #define BNX2X_BC_VER 0x040200 |
26 | 26 | ||
27 | #define BNX2X_MULTI_QUEUE | 27 | #define BNX2X_MULTI_QUEUE |
@@ -671,6 +671,10 @@ enum { | |||
671 | CAM_ISCSI_ETH_LINE, | 671 | CAM_ISCSI_ETH_LINE, |
672 | CAM_MAX_PF_LINE = CAM_ISCSI_ETH_LINE | 672 | CAM_MAX_PF_LINE = CAM_ISCSI_ETH_LINE |
673 | }; | 673 | }; |
674 | /* number of MACs per function in NIG memory - used for SI mode */ | ||
675 | #define NIG_LLH_FUNC_MEM_SIZE 16 | ||
676 | /* number of entries in NIG_REG_LLHX_FUNC_MEM */ | ||
677 | #define NIG_LLH_FUNC_MEM_MAX_OFFSET 8 | ||
674 | 678 | ||
675 | #define BNX2X_VF_ID_INVALID 0xFF | 679 | #define BNX2X_VF_ID_INVALID 0xFF |
676 | 680 | ||
@@ -967,6 +971,8 @@ struct bnx2x { | |||
967 | u16 mf_ov; | 971 | u16 mf_ov; |
968 | u8 mf_mode; | 972 | u8 mf_mode; |
969 | #define IS_MF(bp) (bp->mf_mode != 0) | 973 | #define IS_MF(bp) (bp->mf_mode != 0) |
974 | #define IS_MF_SI(bp) (bp->mf_mode == MULTI_FUNCTION_SI) | ||
975 | #define IS_MF_SD(bp) (bp->mf_mode == MULTI_FUNCTION_SD) | ||
970 | 976 | ||
971 | u8 wol; | 977 | u8 wol; |
972 | 978 | ||
@@ -1010,6 +1016,7 @@ struct bnx2x { | |||
1010 | #define BNX2X_ACCEPT_ALL_UNICAST 0x0004 | 1016 | #define BNX2X_ACCEPT_ALL_UNICAST 0x0004 |
1011 | #define BNX2X_ACCEPT_ALL_MULTICAST 0x0008 | 1017 | #define BNX2X_ACCEPT_ALL_MULTICAST 0x0008 |
1012 | #define BNX2X_ACCEPT_BROADCAST 0x0010 | 1018 | #define BNX2X_ACCEPT_BROADCAST 0x0010 |
1019 | #define BNX2X_ACCEPT_UNMATCHED_UCAST 0x0020 | ||
1013 | #define BNX2X_PROMISCUOUS_MODE 0x10000 | 1020 | #define BNX2X_PROMISCUOUS_MODE 0x10000 |
1014 | 1021 | ||
1015 | u32 rx_mode; | 1022 | u32 rx_mode; |