aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bnx2x.h')
-rw-r--r--drivers/net/bnx2x.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 8678457849f9..8bd80fca9788 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -160,7 +160,7 @@ struct sw_rx_page {
160#define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT) 160#define PAGES_PER_SGE (1 << PAGES_PER_SGE_SHIFT)
161#define SGE_PAGE_SIZE PAGE_SIZE 161#define SGE_PAGE_SIZE PAGE_SIZE
162#define SGE_PAGE_SHIFT PAGE_SHIFT 162#define SGE_PAGE_SHIFT PAGE_SHIFT
163#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN((typeof(PAGE_SIZE))addr) 163#define SGE_PAGE_ALIGN(addr) PAGE_ALIGN((typeof(PAGE_SIZE))(addr))
164 164
165/* SGE ring related macros */ 165/* SGE ring related macros */
166#define NUM_RX_SGE_PAGES 2 166#define NUM_RX_SGE_PAGES 2
@@ -902,6 +902,8 @@ struct bnx2x {
902 u16 rx_quick_cons_trip; 902 u16 rx_quick_cons_trip;
903 u16 rx_ticks_int; 903 u16 rx_ticks_int;
904 u16 rx_ticks; 904 u16 rx_ticks;
905/* Maximal coalescing timeout in us */
906#define BNX2X_MAX_COALESCE_TOUT (0xf0*12)
905 907
906 u32 lin_cnt; 908 u32 lin_cnt;
907 909
@@ -1004,6 +1006,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
1004int bnx2x_get_gpio(struct bnx2x *bp, int gpio_num, u8 port); 1006int bnx2x_get_gpio(struct bnx2x *bp, int gpio_num, u8 port);
1005int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port); 1007int bnx2x_set_gpio(struct bnx2x *bp, int gpio_num, u32 mode, u8 port);
1006int bnx2x_set_gpio_int(struct bnx2x *bp, int gpio_num, u32 mode, u8 port); 1008int bnx2x_set_gpio_int(struct bnx2x *bp, int gpio_num, u32 mode, u8 port);
1009u32 bnx2x_fw_command(struct bnx2x *bp, u32 command);
1007 1010
1008static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, 1011static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
1009 int wait) 1012 int wait)