From c8e1e6883f7aee1ae54b75648ec3a75addc16e67 Mon Sep 17 00:00:00 2001
From: Eilon Greenstein <eilong@broadcom.com>
Date: Sun, 5 Jul 2009 04:18:14 +0000
Subject: [PATCH] --- yaml --- r: 155013 b: refs/heads/master c:
 1e9d9987598fa58f4bd8e72ee152c879136d6723 h: refs/heads/master i:   155011:
 678f0be5f2e5ed8fef3d330b95c67153eb675e6e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x.h      | 2 ++
 trunk/drivers/net/bnx2x_main.c | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 02839334a524..19af9250e27e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3799cf47e3497a472b05f88e7a52a14931597d78
+refs/heads/master: 1e9d9987598fa58f4bd8e72ee152c879136d6723
diff --git a/trunk/drivers/net/bnx2x.h b/trunk/drivers/net/bnx2x.h
index 8678457849f9..85a737c5c23f 100644
--- a/trunk/drivers/net/bnx2x.h
+++ b/trunk/drivers/net/bnx2x.h
@@ -902,6 +902,8 @@ struct bnx2x {
 	u16			rx_quick_cons_trip;
 	u16			rx_ticks_int;
 	u16			rx_ticks;
+/* Maximal coalescing timeout in us */
+#define BNX2X_MAX_COALESCE_TOUT		(0xf0*12)
 
 	u32			lin_cnt;
 
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index 5737b7519005..6c67be679764 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x_main.c
@@ -9069,12 +9069,12 @@ static int bnx2x_set_coalesce(struct net_device *dev,
 	struct bnx2x *bp = netdev_priv(dev);
 
 	bp->rx_ticks = (u16) coal->rx_coalesce_usecs;
-	if (bp->rx_ticks > 3000)
-		bp->rx_ticks = 3000;
+	if (bp->rx_ticks > BNX2X_MAX_COALESCE_TOUT)
+		bp->rx_ticks = BNX2X_MAX_COALESCE_TOUT;
 
 	bp->tx_ticks = (u16) coal->tx_coalesce_usecs;
-	if (bp->tx_ticks > 0x3000)
-		bp->tx_ticks = 0x3000;
+	if (bp->tx_ticks > BNX2X_MAX_COALESCE_TOUT)
+		bp->tx_ticks = BNX2X_MAX_COALESCE_TOUT;
 
 	if (netif_running(dev))
 		bnx2x_update_coalesce(bp);