From c924c99774446dfcc893e2316d5af5c02a1783c8 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Aug 2011 00:47:01 +0000 Subject: [PATCH] --- yaml --- r: 265716 b: refs/heads/master c: 4bb97cae662ea6e2a5aa5982d0b289a8c48d64c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/pasemi/pasemi_mac.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74783a24aca4..efb7468e81fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc516c8f9d35e42dec463dc5c6e1f1202c730fd4 +refs/heads/master: 4bb97cae662ea6e2a5aa5982d0b289a8c48d64c6 diff --git a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c index fad620da7c11..532209588323 100644 --- a/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/trunk/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -1505,9 +1505,8 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev) for (i = 0; i < nfrags; i++) { skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; - map[i+1] = pci_map_page(mac->dma_pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + map[i + 1] = skb_frag_dma_map(&mac->dma_pdev->dev, frag, 0, + frag->size, PCI_DMA_TODEVICE); map_size[i+1] = frag->size; if (pci_dma_mapping_error(mac->dma_pdev, map[i+1])) { nfrags = i;