Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / drivers / net / skge.c

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 0dd42470136d7b51d6e735002e4c7ca3a0238652..5ca5a1b546a162ed23eaf2e422fd9db21eee2537 100644 (file)
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -401,7 +401,7 @@ static int skge_set_ring_param(struct net_device *dev,
        int err;
 
        if (p->rx_pending == 0 || p->rx_pending > MAX_RX_RING_SIZE ||
-           p->tx_pending == 0 || p->tx_pending > MAX_TX_RING_SIZE)
+           p->tx_pending < MAX_SKB_FRAGS+1 || p->tx_pending > MAX_TX_RING_SIZE)
                return -EINVAL;
 
        skge->rx_ring.count = p->rx_pending;