---

yaml --- r: 112191 b: refs/heads/master c: 23e55a3 h: refs/heads/master i: 112189: 7adaa68 112187: 7a6eabe 112183: 2f04fe0 112175: e29454e 112159: 9a28de9 112127: 4241a0d v: v3
git-mirror · Oct 8, 2008 · 18889ac · 18889ac
1 parent 7c5de06
commit 18889ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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;
 		}
 	}