---

yaml --- r: 265715 b: refs/heads/master c: bc516c8 h: refs/heads/master i: 265713: c5b3360 265711: dfcf57a v: v3
git-mirror · Sep 15, 2011 · 4980379 · 4980379
1 parent 86cec52
commit 4980379
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);