diff --git a/[refs] b/[refs] index 6e817525f060..b30d5e249f36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deb8a069e39b272c0a37bfa7a5f52d49600963a4 +refs/heads/master: c4c8d5796ce54e96885e227931986996b343a1d0 diff --git a/trunk/drivers/net/ethernet/alteon/acenic.c b/trunk/drivers/net/ethernet/alteon/acenic.c index 1d6f2db794fd..8794cf831bd0 100644 --- a/trunk/drivers/net/ethernet/alteon/acenic.c +++ b/trunk/drivers/net/ethernet/alteon/acenic.c @@ -2485,9 +2485,9 @@ static netdev_tx_t ace_start_xmit(struct sk_buff *skb, info = ap->skb->tx_skbuff + idx; desc = ap->tx_ring + idx; - mapping = pci_map_page(ap->pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&ap->pdev->dev, frag, 0, + frag->size, + PCI_DMA_TODEVICE); flagsize = (frag->size << 16); if (skb->ip_summed == CHECKSUM_PARTIAL)