diff options
| author | Michael Chan <mchan@broadcom.com> | 2010-02-15 19:42:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 15:19:03 -0800 |
| commit | 5726026bfffa13e9b1098d7bc177618cbbaa9388 (patch) | |
| tree | ecb18de894b79ef7d6c1dff118ae98196e37ba9e /drivers/net | |
| parent | e9f26c49ce790de0064474f97d6402ce1fefac2a (diff) | |
bnx2: Adjust flow control water marks.
The current water marks are too high and can cause unnecessary flow
control frames.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2.c | 2 | ||||
| -rw-r--r-- | drivers/net/bnx2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 063f28394e3..dbe487f2915 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -1277,7 +1277,7 @@ bnx2_init_rx_context(struct bnx2 *bp, u32 cid) if (lo_water >= bp->rx_ring_size) lo_water = 0; - hi_water = bp->rx_ring_size / 4; + hi_water = min_t(int, bp->rx_ring_size / 4, lo_water + 16); if (hi_water <= lo_water) lo_water = 0; diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index b860fbbff35..cd4b0e4637a 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -349,7 +349,7 @@ struct l2_fhdr { #define BNX2_L2CTX_BD_PRE_READ 0x00000000 #define BNX2_L2CTX_CTX_SIZE 0x00000000 #define BNX2_L2CTX_CTX_TYPE 0x00000000 -#define BNX2_L2CTX_LO_WATER_MARK_DEFAULT 32 +#define BNX2_L2CTX_LO_WATER_MARK_DEFAULT 4 #define BNX2_L2CTX_LO_WATER_MARK_SCALE 4 #define BNX2_L2CTX_LO_WATER_MARK_DIS 0 #define BNX2_L2CTX_HI_WATER_MARK_SHIFT 4 |