summaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorNick Nunley <nicholasx.d.nunley@intel.com>2010-02-17 01:06:16 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-17 13:21:39 -0800
commita77ff709dd30a263f8154b05a8514b46098b42ba (patch)
tree4579e2a6e9882bf1fcb98717a64231879ddf3641 /drivers/net/igb
parent58fd62f525e1182fbb2f7566aecb4545720d9aad (diff)
downloadop-kernel-dev-a77ff709dd30a263f8154b05a8514b46098b42ba.zip
op-kernel-dev-a77ff709dd30a263f8154b05a8514b46098b42ba.tar.gz
igb: update tx DMA mapping error handling
This updates the tx DMA mapping error handling code to resemble e1000e/ixgbe. Signed-off-by: Nicholas Nunley <nicholasx.d.nunley@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r--drivers/net/igb/igb_main.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index ab7c5e9..f588e49 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3647,14 +3647,12 @@ dma_error:
buffer_info->length = 0;
buffer_info->next_to_watch = 0;
buffer_info->mapped_as_page = false;
- count--;
/* clear timestamp and dma mappings for remaining portion of packet */
- while (count >= 0) {
- count--;
+ while (count--) {
+ if (i == 0)
+ i = tx_ring->count;
i--;
- if (i < 0)
- i += tx_ring->count;
buffer_info = &tx_ring->buffer_info[i];
igb_unmap_and_free_tx_resource(tx_ring, buffer_info);
}
OpenPOWER on IntegriCloud