Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b057b5 authored by Christoph Paasch's avatar Christoph Paasch Committed by Jeff Kirsher
Browse files

e1000: ethtool: Add missing dma_mapping_error-call in e1000_setup_desc_rings 



After dma_map_single, dma_mapping_error must be called.

Signed-off-by: default avatarChristoph Paasch <christoph.paasch@uclouvain.be>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b175293c

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+11 −3
Original line number Diff line number Diff line
@@ -1053,6 +1053,10 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 
		txdr->buffer_info[i].dma =

			dma_map_single(&pdev->dev, skb->data, skb->len,

				       DMA_TO_DEVICE);

		if (dma_mapping_error(&pdev->dev, txdr->buffer_info[i].dma)) {

			ret_val = 4;

			goto err_nomem;

		}

		tx_desc->buffer_addr = cpu_to_le64(txdr->buffer_info[i].dma);

		tx_desc->lower.data = cpu_to_le32(skb->len);

		tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
@@ -1069,7 +1073,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 
	rxdr->buffer_info = kcalloc(rxdr->count, sizeof(struct e1000_buffer),

				    GFP_KERNEL);

	if (!rxdr->buffer_info) {

		ret_val = 4;

		ret_val = 5;

		goto err_nomem;

	}
@@ -1077,7 +1081,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 
	rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,

					GFP_KERNEL);

	if (!rxdr->desc) {

		ret_val = 5;

		ret_val = 6;

		goto err_nomem;

	}

	memset(rxdr->desc, 0, rxdr->size);
@@ -1101,7 +1105,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 


		skb = alloc_skb(E1000_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);

		if (!skb) {

			ret_val = 6;

			ret_val = 7;

			goto err_nomem;

		}

		skb_reserve(skb, NET_IP_ALIGN);
@@ -1110,6 +1114,10 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) 
		rxdr->buffer_info[i].dma =

			dma_map_single(&pdev->dev, skb->data,

				       E1000_RXBUFFER_2048, DMA_FROM_DEVICE);

		if (dma_mapping_error(&pdev->dev, rxdr->buffer_info[i].dma)) {

			ret_val = 8;

			goto err_nomem;

		}

		rx_desc->buffer_addr = cpu_to_le64(rxdr->buffer_info[i].dma);

		memset(skb->data, 0x00, skb->len);

	}