|
@@ -2146,8 +2146,11 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
prev_tx = put_tx;
|
|
|
prev_tx_ctx = np->put_tx_ctx;
|
|
|
bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;
|
|
|
- np->put_tx_ctx->dma = pci_map_page(np->pci_dev, frag->page, frag->page_offset+offset, bcnt,
|
|
|
- PCI_DMA_TODEVICE);
|
|
|
+ np->put_tx_ctx->dma = skb_frag_dma_map(
|
|
|
+ &np->pci_dev->dev,
|
|
|
+ frag, offset,
|
|
|
+ bcnt,
|
|
|
+ PCI_DMA_TODEVICE);
|
|
|
np->put_tx_ctx->dma_len = bcnt;
|
|
|
np->put_tx_ctx->dma_single = 0;
|
|
|
put_tx->buf = cpu_to_le32(np->put_tx_ctx->dma);
|
|
@@ -2257,8 +2260,11 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
|
|
|
prev_tx = put_tx;
|
|
|
prev_tx_ctx = np->put_tx_ctx;
|
|
|
bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size;
|
|
|
- np->put_tx_ctx->dma = pci_map_page(np->pci_dev, frag->page, frag->page_offset+offset, bcnt,
|
|
|
- PCI_DMA_TODEVICE);
|
|
|
+ np->put_tx_ctx->dma = skb_frag_dma_map(
|
|
|
+ &np->pci_dev->dev,
|
|
|
+ frag, offset,
|
|
|
+ bcnt,
|
|
|
+ PCI_DMA_TODEVICE);
|
|
|
np->put_tx_ctx->dma_len = bcnt;
|
|
|
np->put_tx_ctx->dma_single = 0;
|
|
|
put_tx->bufhigh = cpu_to_le32(dma_high(np->put_tx_ctx->dma));
|