[TG3]: Add lower bound checks for tx ring size.
authorMichael Chan <mchan@broadcom.com>
Thu, 19 Oct 2006 03:55:18 +0000 (20:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Oct 2006 03:55:18 +0000 (20:55 -0700)
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>
drivers/net/tg3.c

index 39e483308a448bf2d5b865690183129b61f7e5f9..7ba9dd2b1f80b0903df43a1baff6017068aff7ae 100644 (file)
@@ -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)) {