From 9b01bda7d3e4e94f00b9dba5e5857f6d44e1adc2 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 18 Oct 2006 20:55:18 -0700 Subject: [PATCH] --- yaml --- r: 40049 b: refs/heads/master c: bc3a9254a7925b6278f6d882746fe6a0bdf6f610 h: refs/heads/master i: 40047: c9b9da4687e6e32c5b7ceb87cb7ebceba961f467 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 063e1061c1d4..d9da6f53ece1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42952231c6a8623117ee3cc89c82d382dc69ca30 +refs/heads/master: bc3a9254a7925b6278f6d882746fe6a0bdf6f610 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 39e483308a44..7ba9dd2b1f80 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/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)) {