From 44e5b83998c54a4efae2a3e452e0495a4d7d71ab Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Thu, 28 Mar 2013 11:32:44 +0000
Subject: [PATCH] --- yaml --- r: 362063 b: refs/heads/master c:
 dc574f1d52d893f516f3786ff7635450bac00eef h: refs/heads/master i:   362061:
 bd6d4f289bfb90bf35bac3baa1287979a407d5eb   362059:
 56eeb8a29da443862dc694a01c70777002fd21be   362055:
 ee2c69407f926901d3eab0e84bd3c9cfb59aec19   362047:
 52bc94ba5405f263cf3fd6d5c07ea71389fcca9a v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/calxeda/xgmac.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ee181faa528f..fa95b340491c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a561cf7edf9863198bfccecfc5cfe26d951ebd20
+refs/heads/master: dc574f1d52d893f516f3786ff7635450bac00eef
diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c
index a170065b5973..bb1e80bfa78a 100644
--- a/trunk/drivers/net/ethernet/calxeda/xgmac.c
+++ b/trunk/drivers/net/ethernet/calxeda/xgmac.c
@@ -1141,6 +1141,9 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit)
 		struct sk_buff *skb;
 		int frame_len;
 
+		if (!dma_ring_cnt(priv->rx_head, priv->rx_tail, DMA_RX_RING_SZ))
+			break;
+
 		entry = priv->rx_tail;
 		p = priv->dma_rx + entry;
 		if (desc_get_owner(p))