diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-12-05 22:54:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-05 22:54:40 -0800 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /drivers/net/bnx2.h | |
| parent | tcp: move some parts from tcp_write_xmit (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-730c30ec646bd252a9448a66ecd51d794853513f.tar.xz linux-dev-730c30ec646bd252a9448a66ecd51d794853513f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 0763108fa1c5..2f43c45b7ad6 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -378,6 +378,9 @@ struct l2_fhdr { * pci_config_l definition * offset: 0000 */ +#define BNX2_PCICFG_MSI_CONTROL 0x00000058 +#define BNX2_PCICFG_MSI_CONTROL_ENABLE (1L<<16) + #define BNX2_PCICFG_MISC_CONFIG 0x00000068 #define BNX2_PCICFG_MISC_CONFIG_TARGET_BYTE_SWAP (1L<<2) #define BNX2_PCICFG_MISC_CONFIG_TARGET_MB_WORD_SWAP (1L<<3) @@ -6882,6 +6885,9 @@ struct bnx2 { u8 num_tx_rings; u8 num_rx_rings; + + u32 idle_chk_status_idx; + }; #define REG_RD(bp, offset) \ |