From 7e003a005d880dc59f0a9d7ce62cb60a27fd1fea Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun, 24 Aug 2008 02:33:47 +0200
Subject: [PATCH] --- yaml --- r: 109242 b: refs/heads/master c:
 9e1f37724265725ad4c14fc2ef60a162dc13ac64 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48a23fb2ebf0..5bdef51afc1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e0b1bf6ac6c4c6dd985e586cd765aede4678bba
+refs/heads/master: 9e1f37724265725ad4c14fc2ef60a162dc13ac64
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 30e6d4b8d564..e33dfc0165f6 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -527,7 +527,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
 	int rx;
 
 	rx = 0;
-	while (rx < budget) {
+	while (rx < budget && rxq->rx_desc_count) {
 		struct rx_desc *rx_desc;
 		unsigned int cmd_sts;
 		struct sk_buff *skb;