---

yaml --- r: 265719 b: refs/heads/master c: e0ee9b9 h: refs/heads/master i: 265717: fab677c 265715: 4980379 265711: dfcf57a v: v3
git-mirror · Sep 15, 2011 · 083fcd7 · 083fcd7
1 parent 0cf7b96
commit 083fcd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2af830e5919b6371e109b71597ceca977d23199c
+refs/heads/master: e0ee9b98d5ff10acd7477ea5f0dcaffeb4a999bc
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2135,8 +2135,8 @@ qlcnic_map_tx_skb(struct pci_dev *pdev,
 		frag = &skb_shinfo(skb)->frags[i];
 		nf = &pbuf->frag_array[i+1];
 
-		map = pci_map_page(pdev, frag->page, frag->page_offset,
-				frag->size, PCI_DMA_TODEVICE);
+		map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
+				       PCI_DMA_TODEVICE);
 		if (pci_dma_mapping_error(pdev, map))
 			goto unwind;