From 196ad90f0535d3555f49593851dda7ea311782b2 Mon Sep 17 00:00:00 2001
From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 24 Nov 2010 07:42:43 +0000
Subject: [PATCH] --- yaml --- r: 225015 b: refs/heads/master c:
 36b973df713e1395b79896de667ad7dbb1925fa7 h: refs/heads/master i:   225013:
 633d02f70736971e880bbd977db8f1e4751c3854   225011:
 dce5ca35029b9bf92559f72610268aadd9deaa41   225007:
 e9a13a3ec489c101762c42f84d73717850837618 v: v3

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

diff --git a/[refs] b/[refs]
index 65ccbff80af8..a533e9499ccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073287c037083497ebaaf75ead469b769f218615
+refs/heads/master: 36b973df713e1395b79896de667ad7dbb1925fa7
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
index 393b76d27536..4bf843ac7ea3 100644
--- a/trunk/drivers/net/e1000e/netdev.c
+++ b/trunk/drivers/net/e1000e/netdev.c
@@ -4629,7 +4629,7 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
 
 	i = tx_ring->next_to_use;
 
-	while (count--) {
+	do {
 		buffer_info = &tx_ring->buffer_info[i];
 		tx_desc = E1000_TX_DESC(*tx_ring, i);
 		tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
@@ -4640,7 +4640,7 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,
 		i++;
 		if (i == tx_ring->count)
 			i = 0;
-	}
+	} while (--count > 0);
 
 	tx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);