Merge branch 'master' of ../netdev-next/ (986eaa90) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/net/ethernet/3com/3c59x.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2179,8 +2179,9 @@ boomerang_start_xmit(struct sk_buff skb, struct net_device dev)
	skb_frag_t *frag = &skb_shinfo(skb)->frags[i];		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

	vp->tx_ring[entry].frag[i+1].addr =		vp->tx_ring[entry].frag[i+1].addr =
	cpu_to_le32(pci_map_single(VORTEX_PCI(vp),		cpu_to_le32(pci_map_single(
	(void*)page_address(frag->page) + frag->page_offset,		VORTEX_PCI(vp),
			(void *)skb_frag_address(frag),
	frag->size, PCI_DMA_TODEVICE));		frag->size, PCI_DMA_TODEVICE));

	if (i == skb_shinfo(skb)->nr_frags-1)		if (i == skb_shinfo(skb)->nr_frags-1)

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -113,9 +113,8 @@ static void greth_print_tx_packet(struct sk_buff *skb)
	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

	print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,		print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
	phys_to_virt(page_to_phys(skb_shinfo(skb)->frags[i].page)) +		skb_frag_address(&skb_shinfo(skb)->frags[i]),
	skb_shinfo(skb)->frags[i].page_offset,		skb_shinfo(skb)->frags[i].size, true);
	length, true);
	}		}
	}		}

	@@ -528,10 +527,7 @@ greth_start_xmit_gbit(struct sk_buff skb, struct net_device dev)

	greth_write_bd(&bdp->stat, status);		greth_write_bd(&bdp->stat, status);

	dma_addr = dma_map_page(greth->dev,		dma_addr = skb_frag_dma_map(greth->dev, frag, 0, frag->size,
	frag->page,
	frag->page_offset,
	frag->size,
	DMA_TO_DEVICE);		DMA_TO_DEVICE);

	if (unlikely(dma_mapping_error(greth->dev, dma_addr)))		if (unlikely(dma_mapping_error(greth->dev, dma_addr)))

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2485,8 +2485,8 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb,
	info = ap->skb->tx_skbuff + idx;		info = ap->skb->tx_skbuff + idx;
	desc = ap->tx_ring + idx;		desc = ap->tx_ring + idx;

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

	flagsize = (frag->size << 16);		flagsize = (frag->size << 16);

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2180,9 +2180,8 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,

	buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);
	buffer_info->length = frag->size;		buffer_info->length = frag->size;
	buffer_info->dma =		buffer_info->dma = skb_frag_dma_map(&adapter->pdev->dev,
	pci_map_page(adapter->pdev, frag->page,		frag, 0,
	frag->page_offset,
	buffer_info->length,		buffer_info->length,
	PCI_DMA_TODEVICE);		PCI_DMA_TODEVICE);
	ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1765,9 +1765,8 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
	MAX_TX_BUF_LEN : buf_len;		MAX_TX_BUF_LEN : buf_len;
	buf_len -= tx_buffer->length;		buf_len -= tx_buffer->length;

	tx_buffer->dma =		tx_buffer->dma = skb_frag_dma_map(&adapter->pdev->dev,
	pci_map_page(adapter->pdev, frag->page,		frag,
	frag->page_offset +
	(i * MAX_TX_BUF_LEN),		(i * MAX_TX_BUF_LEN),
	tx_buffer->length,		tx_buffer->length,
	PCI_DMA_TODEVICE);		PCI_DMA_TODEVICE);