From 18889ac128d772310c48c4f3521eca4afc7ad58f Mon Sep 17 00:00:00 2001
From: "Brandeburg, Jesse" <jesse.brandeburg@intel.com>
Date: Tue, 30 Sep 2008 13:08:48 +0000
Subject: [PATCH] --- yaml --- r: 112191 b: refs/heads/master c:
 23e55a32ca1ffdbe7a492ef99f0e0ac48e504a13 h: refs/heads/master i:   112189:
 7adaa68be17a786dd74006a93f96f08ff8dadebb   112187:
 7a6eabe3e0cc3c179e7fe4b9f8fc43c1b25d56cb   112183:
 2f04fe001a7e7cd54b146dba0c2167866c176310   112175:
 e29454eaa429a4d5936c99b7f99f5bf3cb088e6f   112159:
 9a28de9c2889b0b9dcdf0064847e24319accc5e8   112127:
 4241a0d6be581781db2651797c46b776e5b64b77 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ixgb/ixgb_main.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bc9052e99288..803ca0a6eabe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1694f25b4beb80b911fb21efcff36acca39aa696
+refs/heads/master: 23e55a32ca1ffdbe7a492ef99f0e0ac48e504a13
diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c
index aa75385cd6c7..be3c7dc96f63 100644
--- a/trunk/drivers/net/ixgb/ixgb_main.c
+++ b/trunk/drivers/net/ixgb/ixgb_main.c
@@ -977,15 +977,17 @@ ixgb_clean_rx_ring(struct ixgb_adapter *adapter)
 
 	for (i = 0; i < rx_ring->count; i++) {
 		buffer_info = &rx_ring->buffer_info[i];
-		if (buffer_info->skb) {
-
+		if (buffer_info->dma) {
 			pci_unmap_single(pdev,
 					 buffer_info->dma,
 					 buffer_info->length,
 					 PCI_DMA_FROMDEVICE);
+			buffer_info->dma = 0;
+			buffer_info->length = 0;
+		}
 
+		if (buffer_info->skb) {
 			dev_kfree_skb(buffer_info->skb);
-
 			buffer_info->skb = NULL;
 		}
 	}