diff options
| author |   Michael Chan <mchan@broadcom.com> | 2012-12-06 10:33:11 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-12-07 12:44:02 -0500 |
| commit | 68c64d2034faa0961ad4a38b915dc10a4581bb64 (patch) | |
| tree | e53af9884ac3a4e589c7b247aa9962579d30ae2f /drivers/net/ethernet/broadcom/cnic.h | |
| parent | bnx2: Add BNX2 prefix to CHIP ID and name macros (diff) | |
| download | linux-dev-68c64d2034faa0961ad4a38b915dc10a4581bb64.tar.xz linux-dev-68c64d2034faa0961ad4a38b915dc10a4581bb64.zip | |
cnic: Include bnx2x.h
by removing duplicate symbols and removing some redundant code.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h index 6fa7a989606a..62c670619ae6 100644 --- a/drivers/net/ethernet/broadcom/cnic.h +++ b/drivers/net/ethernet/broadcom/cnic.h @@ -186,14 +186,6 @@ struct kcq_info { u16 (*hw_idx)(u16); }; -struct iro { - u32 base; - u16 m1; - u16 m2; - u16 m3; - u16 size; -}; - struct cnic_uio_dev { struct uio_info cnic_uinfo; u32 uio_dev; @@ -241,9 +233,6 @@ struct cnic_local { u16 rx_cons; u16 tx_cons; - const struct iro *iro_arr; -#define IRO (((struct cnic_local *) dev->cnic_priv)->iro_arr) - struct cnic_dma kwq_info; struct kwqe **kwq; @@ -316,9 +305,6 @@ struct cnic_local { int func; u32 pfid; u8 port_mode; -#define CHIP_4_PORT_MODE 0 -#define CHIP_2_PORT_MODE 1 -#define CHIP_PORT_MODE_NONE 2 u32 shmem_base; @@ -420,8 +406,6 @@ struct bnx2x_bd_chain_next { BNX2X_CHIP_IS_57840(x)) #define BNX2X_CHIP_IS_E2_PLUS(x) (BNX2X_CHIP_IS_E2(x) || BNX2X_CHIP_IS_E3(x)) -#define IS_E1H_OFFSET BNX2X_CHIP_IS_E1H(cp->chip_id) - #define BNX2X_RX_DESC_CNT (BNX2_PAGE_SIZE / \ sizeof(struct eth_rx_bd)) #define BNX2X_MAX_RX_DESC_CNT (BNX2X_RX_DESC_CNT - 2) |