From 49803795eb08c7fd869ee392c41d5a36e18328b2 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Aug 2011 00:47:00 +0000 Subject: [PATCH] --- yaml --- r: 265715 b: refs/heads/master c: bc516c8f9d35e42dec463dc5c6e1f1202c730fd4 h: refs/heads/master i: 265713: c5b3360d595d749b729e85d1ae79aa03b2bf6318 265711: dfcf57a1c1707da2be5deeee931b42e6a886c1b1 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/natsemi/ns83820.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ba119e93b09..74783a24aca4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 134b413ca3a1055608495bbb60caeb754a073766 +refs/heads/master: bc516c8f9d35e42dec463dc5c6e1f1202c730fd4 diff --git a/trunk/drivers/net/ethernet/natsemi/ns83820.c b/trunk/drivers/net/ethernet/natsemi/ns83820.c index 1a1e20e97a23..e0895e40f10a 100644 --- a/trunk/drivers/net/ethernet/natsemi/ns83820.c +++ b/trunk/drivers/net/ethernet/natsemi/ns83820.c @@ -1160,9 +1160,8 @@ static netdev_tx_t ns83820_hard_start_xmit(struct sk_buff *skb, if (!nr_frags) break; - buf = pci_map_page(dev->pci_dev, frag->page, - frag->page_offset, - frag->size, PCI_DMA_TODEVICE); + buf = skb_frag_dma_map(&dev->pci_dev->dev, frag, 0, + frag->size, PCI_DMA_TODEVICE); dprintk("frag: buf=%08Lx page=%08lx offset=%08lx\n", (long long)buf, (long) page_to_pfn(frag->page), frag->page_offset);