aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x/bnx2x.h
diff options
context:
space:
mode:
authorDmitry Kravkov <dmitry@broadcom.com>2010-10-05 23:32:10 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-06 17:10:40 -0400
commitd6214d7aaa9a82b206dac9e3b0665c49c522a271 (patch)
tree593dae3485d4d5e13eec568460dcd7d8dde4381d /drivers/net/bnx2x/bnx2x.h
parent217de5aaed833982c420fc37d82272d84eaefe64 (diff)
bnx2x: move msix table initialization to probe()
Decide which interrupt mode to use (MSI-X, MSI, INTa) only once in probe() and initialize appropriate structures. Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
-rw-r--r--drivers/net/bnx2x/bnx2x.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 9b78a0487791..d80809f5ffc9 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -308,6 +308,7 @@ union host_hc_status_block {
308 308
309struct bnx2x_fastpath { 309struct bnx2x_fastpath {
310 310
311#define BNX2X_NAPI_WEIGHT 128
311 struct napi_struct napi; 312 struct napi_struct napi;
312 union host_hc_status_block status_blk; 313 union host_hc_status_block status_blk;
313 /* chip independed shortcuts into sb structure */ 314 /* chip independed shortcuts into sb structure */
@@ -920,8 +921,10 @@ struct bnx2x {
920#define USING_DAC_FLAG 0x10 921#define USING_DAC_FLAG 0x10
921#define USING_MSIX_FLAG 0x20 922#define USING_MSIX_FLAG 0x20
922#define USING_MSI_FLAG 0x40 923#define USING_MSI_FLAG 0x40
924
923#define TPA_ENABLE_FLAG 0x80 925#define TPA_ENABLE_FLAG 0x80
924#define NO_MCP_FLAG 0x100 926#define NO_MCP_FLAG 0x100
927#define DISABLE_MSI_FLAG 0x200
925#define BP_NOMCP(bp) (bp->flags & NO_MCP_FLAG) 928#define BP_NOMCP(bp) (bp->flags & NO_MCP_FLAG)
926#define HW_VLAN_TX_FLAG 0x400 929#define HW_VLAN_TX_FLAG 0x400
927#define HW_VLAN_RX_FLAG 0x800 930#define HW_VLAN_RX_FLAG 0x800