From: Michael Chan <mchan@broadcom.com>
Date: Thu, 19 Oct 2006 03:55:18 +0000 (-0700)
Subject: [TG3]: Add lower bound checks for tx ring size.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bc3a9254a7925b6278f6d882746fe6a0bdf6f610;p=deliverable%2Flinux.git

[TG3]: Add lower bound checks for tx ring size.

The minimum tx ring size must be greater than MAX_SKB_FRAGS or 3
times that on some chips with TSO bugs.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 39e483308a44..7ba9dd2b1f80 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -8106,7 +8106,10 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 
 	if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) ||
 	    (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||
-	    (ering->tx_pending > TG3_TX_RING_SIZE - 1))
+	    (ering->tx_pending > TG3_TX_RING_SIZE - 1) ||
+	    (ering->tx_pending <= MAX_SKB_FRAGS) ||
+	    ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG) &&
+	     (ering->tx_pending <= (MAX_SKB_FRAGS * 3))))
 		return -EINVAL;
 
 	if (netif_running(dev)) {