diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-05 22:06:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:06:45 -0400 |
| commit | 6b1344724e10c166d9e3c17011ed879ddf302e94 (patch) | |
| tree | bbfa98b183c1249a58ad2debdb696392d8c4a029 /drivers/net/bnx2x.h | |
| parent | 8e4a718ff38d8539938ec3421935904c27e00c39 (diff) | |
| parent | 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 8678457849f9..85a737c5c23f 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h | |||
| @@ -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 | ||