From: "Michael Chan" <mchan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH -next 3/6] bnx2: Adjust flow control water marks.
Date: Mon, 15 Feb 2010 21:42:09 -0800 [thread overview]
Message-ID: <1266298932-28129-3-git-send-email-mchan@broadcom.com> (raw)
In-Reply-To: <1266298932-28129-2-git-send-email-mchan@broadcom.com>
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>
---
drivers/net/bnx2.c | 2 +-
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 063f283..54d43d8 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 b860fbb..cd4b0e4 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
--
1.6.4.GIT
next prev parent reply other threads:[~2010-02-16 5:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 5:42 [PATCH -next 1/6] bnx2: Check BNX2_FLAG_USING_MSIX flag when setting up MSIX Michael Chan
2010-02-16 5:42 ` [PATCH -next 2/6] bnx2: Need to call cnic_setup_cnic_irq_info() after MTU change Michael Chan
2010-02-16 5:42 ` Michael Chan [this message]
2010-02-16 5:42 ` [PATCH -next 4/6] bnx2: Allow user-specified multiple advertisement speed values Michael Chan
2010-02-16 5:42 ` [PATCH -next 5/6] bnx2: Fix bug when saving statistics Michael Chan
2010-02-16 23:20 ` David Miller
[not found] ` <1266298932-28129-6-git-send-email-mchan@broadcom.com>
2010-02-16 23:20 ` [PATCH -next 6/6] bnx2: Update firmwares and update version to 2.0.8 David Miller
2010-02-16 23:20 ` [PATCH -next 4/6] bnx2: Allow user-specified multiple advertisement speed values David Miller
2010-02-16 23:20 ` [PATCH -next 3/6] bnx2: Adjust flow control water marks David Miller
2010-02-16 23:20 ` [PATCH -next 2/6] bnx2: Need to call cnic_setup_cnic_irq_info() after MTU change David Miller
2010-02-16 23:20 ` [PATCH -next 1/6] bnx2: Check BNX2_FLAG_USING_MSIX flag when setting up MSIX David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1266298932-28129-3-git-send-email-mchan@broadcom.com \
--to=mchan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).