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

Commit 5d6bcdfe authored Oct 06, 2011 by Ian Campbell Committed by David S. Miller Oct 06, 2011

net: use DMA_x_DEVICE and dma_mapping_error with skb_frag_dma_map



When I converted some drivers from pci_map_page to skb_frag_dma_map I
neglected to convert PCI_DMA_xDEVICE into DMA_x_DEVICE and
pci_dma_mapping_error into dma_mapping_error.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 27737aa3

drivers/infiniband/hw/amso1100/c2.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -803,8 +803,7 @@ static int c2_xmit_frame(struct sk_buff skb, struct net_device netdev)
	skb_frag_t *frag = &skb_shinfo(skb)->frags[i];		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
	maplen = frag->size;		maplen = frag->size;
	mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag,		mapaddr = skb_frag_dma_map(&c2dev->pcidev->dev, frag,
	0, maplen,		0, maplen, DMA_TO_DEVICE);
	PCI_DMA_TODEVICE);
	elem = elem->next;		elem = elem->next;
	elem->skb = NULL;		elem->skb = NULL;
	elem->mapaddr = mapaddr;		elem->mapaddr = mapaddr;

drivers/infiniband/hw/nes/nes_nic.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -445,7 +445,7 @@ static int nes_nic_send(struct sk_buff skb, struct net_device netdev)
	&skb_shinfo(skb)->frags[skb_fragment_index];		&skb_shinfo(skb)->frags[skb_fragment_index];
	bus_address = skb_frag_dma_map(&nesdev->pcidev->dev,		bus_address = skb_frag_dma_map(&nesdev->pcidev->dev,
	frag, 0, frag->size,		frag, 0, frag->size,
	PCI_DMA_TODEVICE);		DMA_TO_DEVICE);
	wqe_fragment_length[wqe_fragment_index] =		wqe_fragment_length[wqe_fragment_index] =
	cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size);		cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size);
	set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index),		set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index),
	@@ -566,7 +566,7 @@ static int nes_netdev_start_xmit(struct sk_buff skb, struct net_device netdev)
	tso_bus_address[tso_frag_count] =		tso_bus_address[tso_frag_count] =
	skb_frag_dma_map(&nesdev->pcidev->dev,		skb_frag_dma_map(&nesdev->pcidev->dev,
	frag, 0, frag->size,		frag, 0, frag->size,
	PCI_DMA_TODEVICE);		DMA_TO_DEVICE);
	}		}

	tso_frag_index = 0;		tso_frag_index = 0;

drivers/net/ethernet/alteon/acenic.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2487,7 +2487,7 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb,

	mapping = skb_frag_dma_map(&ap->pdev->dev, frag, 0,		mapping = skb_frag_dma_map(&ap->pdev->dev, frag, 0,
	frag->size,		frag->size,
	PCI_DMA_TODEVICE);		DMA_TO_DEVICE);

	flagsize = (frag->size << 16);		flagsize = (frag->size << 16);
	if (skb->ip_summed == CHECKSUM_PARTIAL)		if (skb->ip_summed == CHECKSUM_PARTIAL)

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2183,7 +2183,7 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,
	buffer_info->dma = skb_frag_dma_map(&adapter->pdev->dev,		buffer_info->dma = skb_frag_dma_map(&adapter->pdev->dev,
	frag, 0,		frag, 0,
	buffer_info->length,		buffer_info->length,
	PCI_DMA_TODEVICE);		DMA_TO_DEVICE);
	ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);
	ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE,		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_PAGE,
	ATL1C_PCIMAP_TODEVICE);		ATL1C_PCIMAP_TODEVICE);

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1769,7 +1769,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
	frag,		frag,
	(i * MAX_TX_BUF_LEN),		(i * MAX_TX_BUF_LEN),
	tx_buffer->length,		tx_buffer->length,
	PCI_DMA_TODEVICE);		DMA_TO_DEVICE);
	ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);		ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);
	use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);		use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
	use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) \|		use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) \|