Commit 065946c6 authored Mar 20, 2013 by Christoph Paasch Committed by Jeff Kirsher Mar 27, 2013

ixgb: Add missing dma_mapping_error-call in ixgb_alloc_rx_buffers



After dma_map_single, dma_mapping_error must be called. It seems safe to
not free the skb allocated in this function, as the skb can be reused
later.

Additionally this patch fixes one coding-style error.

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent d6b057b5

drivers/net/ethernet/intel/ixgb/ixgb_main.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2159,6 +2159,10 @@ map_skb:
		skb->data,
		adapter->rx_buffer_len,
		DMA_FROM_DEVICE);
		if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
		adapter->alloc_rx_buff_failed++;
		break;
		}

		rx_desc = IXGB_RX_DESC(*rx_ring, i);
		rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
		@@ -2168,7 +2172,8 @@ map_skb:
		rx_desc->status = 0;


		if (++i == rx_ring->count) i = 0;
		if (++i == rx_ring->count)
		i = 0;
		buffer_info = &rx_ring->buffer_info[i];
		}