diff --git a/[refs] b/[refs]
index 16488ef508ad..ab7ef0d7acfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1844f747947bb89d7f12cd3034548805113f764b
+refs/heads/master: 7958a45310519811134a5b911d863201786978ab
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index 9b12a13a640f..9831b3f408aa 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -1284,7 +1284,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	spin_lock_irqsave(&priv->txlock, flags);
 
 	/* check if there is space to queue this packet */
-	if (nr_frags > priv->num_txbdfree) {
+	if ((nr_frags+1) > priv->num_txbdfree) {
 		/* no space, stop the queue */
 		netif_stop_queue(dev);
 		dev->stats.tx_fifo_errors++;