From c22124821a666eff7c90c0dbc33536ddcef4d454 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Wed, 5 May 2010 13:03:09 +0000
Subject: [PATCH] --- yaml --- r: 194777 b: refs/heads/master c:
 4d30b8013b2d82138d6900965fe9fcd062f2d06d h: refs/heads/master i:   194775:
 1026620307eec6cd54692c777c33316b991466e5 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/net/octeon/octeon_mgmt.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4cd1027c8d73..a35bf712d93d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62538d2490d071e822d85651445c8a0bb4ed5a4b
+refs/heads/master: 4d30b8013b2d82138d6900965fe9fcd062f2d06d
diff --git a/trunk/drivers/net/octeon/octeon_mgmt.c b/trunk/drivers/net/octeon/octeon_mgmt.c
index bbbd737210f9..b975a2fad953 100644
--- a/trunk/drivers/net/octeon/octeon_mgmt.c
+++ b/trunk/drivers/net/octeon/octeon_mgmt.c
@@ -189,12 +189,19 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
 
 	mix_orcnt.u64 = cvmx_read_csr(CVMX_MIXX_ORCNT(port));
 	while (mix_orcnt.s.orcnt) {
+		spin_lock_irqsave(&p->tx_list.lock, flags);
+
+		mix_orcnt.u64 = cvmx_read_csr(CVMX_MIXX_ORCNT(port));
+
+		if (mix_orcnt.s.orcnt == 0) {
+			spin_unlock_irqrestore(&p->tx_list.lock, flags);
+			break;
+		}
+
 		dma_sync_single_for_cpu(p->dev, p->tx_ring_handle,
 					ring_size_to_bytes(OCTEON_MGMT_TX_RING_SIZE),
 					DMA_BIDIRECTIONAL);
 
-		spin_lock_irqsave(&p->tx_list.lock, flags);
-
 		re.d64 = p->tx_ring[p->tx_next_clean];
 		p->tx_next_clean =
 			(p->tx_next_clean + 1) % OCTEON_MGMT_TX_RING_SIZE;