From 87d24193d12fc86c1533768732b441d28882b829 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 29 Aug 2011 23:18:19 +0000 Subject: [PATCH] --- yaml --- r: 265767 b: refs/heads/master c: c4c8d5796ce54e96885e227931986996b343a1d0 h: refs/heads/master i: 265765: eb784e5371f5b64b2a5400f311183581c8e97fdf 265763: cd245d12483b88d1016a405bda9dbb897866ca4b 265759: 7be87c9226d8aad7a332f8baa77221feb2fd8b61 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/alteon/acenic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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)