---

yaml --- r: 362063 b: refs/heads/master c: dc574f1 h: refs/heads/master i: 362061: bd6d4f2 362059: 56eeb8a 362055: ee2c694 362047: 52bc94b v: v3
git-mirror · Mar 29, 2013 · 44e5b83 · 44e5b83
1 parent cac83e8
commit 44e5b83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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))