diff --git a/[refs] b/[refs]
index 7d9cb90b4051..10c0b6c4ff6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e881592e0420dfb5626344a69b15ae268ee98c7
+refs/heads/master: 12e4ab79cd828563dc090d2117dc8626b344bc8f
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 72d3f36ff284..481a2c4ff0cd 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -489,7 +489,7 @@ static void rxq_refill(struct rx_queue *rxq)
 		skb_reserve(skb, 2);
 	}
 
-	if (rxq->rx_desc_count == 0) {
+	if (rxq->rx_desc_count != rxq->rx_ring_size) {
 		rxq->rx_oom.expires = jiffies + (HZ / 10);
 		add_timer(&rxq->rx_oom);
 	}