diff --git a/[refs] b/[refs]
index 6222f768d0a3..ced22eebc254 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e777a2a7dc9fad3d0b016c662c2fb60e6b20e7
+refs/heads/master: a06631cbdc09fe33892f08238be498eaa84892ee
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index 0dd42470136d..5ca5a1b546a1 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/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;