diff options
| author | Michael Chan <mchan@broadcom.com> | 2012-12-06 05:33:11 -0500 |
|---|---|---|
| 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 | 4ce45e02469c382699f4c5f6df727aea9dd2e1ca (diff) | |
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 { | |||
| 186 | u16 (*hw_idx)(u16); | 186 | u16 (*hw_idx)(u16); |
| 187 | }; | 187 | }; |
| 188 | 188 | ||
| 189 | struct iro { | ||
| 190 | u32 base; | ||
| 191 | u16 m1; | ||
| 192 | u16 m2; | ||
| 193 | u16 m3; | ||
| 194 | u16 size; | ||
| 195 | }; | ||
| 196 | |||
| 197 | struct cnic_uio_dev { | 189 | struct cnic_uio_dev { |
| 198 | struct uio_info cnic_uinfo; | 190 | struct uio_info cnic_uinfo; |
| 199 | u32 uio_dev; | 191 | u32 uio_dev; |
| @@ -241,9 +233,6 @@ struct cnic_local { | |||
| 241 | u16 rx_cons; | 233 | u16 rx_cons; |
| 242 | u16 tx_cons; | 234 | u16 tx_cons; |
| 243 | 235 | ||
| 244 | const struct iro *iro_arr; | ||
| 245 | #define IRO (((struct cnic_local *) dev->cnic_priv)->iro_arr) | ||
| 246 | |||
| 247 | struct cnic_dma kwq_info; | 236 | struct cnic_dma kwq_info; |
| 248 | struct kwqe **kwq; | 237 | struct kwqe **kwq; |
| 249 | 238 | ||
| @@ -316,9 +305,6 @@ struct cnic_local { | |||
| 316 | int func; | 305 | int func; |
| 317 | u32 pfid; | 306 | u32 pfid; |
| 318 | u8 port_mode; | 307 | u8 port_mode; |
| 319 | #define CHIP_4_PORT_MODE 0 | ||
| 320 | #define CHIP_2_PORT_MODE 1 | ||
| 321 | #define CHIP_PORT_MODE_NONE 2 | ||
| 322 | 308 | ||
| 323 | u32 shmem_base; | 309 | u32 shmem_base; |
| 324 | 310 | ||
| @@ -420,8 +406,6 @@ struct bnx2x_bd_chain_next { | |||
| 420 | BNX2X_CHIP_IS_57840(x)) | 406 | BNX2X_CHIP_IS_57840(x)) |
| 421 | #define BNX2X_CHIP_IS_E2_PLUS(x) (BNX2X_CHIP_IS_E2(x) || BNX2X_CHIP_IS_E3(x)) | 407 | #define BNX2X_CHIP_IS_E2_PLUS(x) (BNX2X_CHIP_IS_E2(x) || BNX2X_CHIP_IS_E3(x)) |
| 422 | 408 | ||
| 423 | #define IS_E1H_OFFSET BNX2X_CHIP_IS_E1H(cp->chip_id) | ||
| 424 | |||
| 425 | #define BNX2X_RX_DESC_CNT (BNX2_PAGE_SIZE / \ | 409 | #define BNX2X_RX_DESC_CNT (BNX2_PAGE_SIZE / \ |
| 426 | sizeof(struct eth_rx_bd)) | 410 | sizeof(struct eth_rx_bd)) |
| 427 | #define BNX2X_MAX_RX_DESC_CNT (BNX2X_RX_DESC_CNT - 2) | 411 | #define BNX2X_MAX_RX_DESC_CNT (BNX2X_RX_DESC_CNT - 2) |