From 083fcd7582c31526af9ef69d5ba7f3daf1665995 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Wed, 31 Aug 2011 00:47:04 +0000
Subject: [PATCH] --- yaml --- r: 265719 b: refs/heads/master c:
 e0ee9b98d5ff10acd7477ea5f0dcaffeb4a999bc h: refs/heads/master i:   265717:
 fab677c3f5fa9f01ed835c02e423c9289c594d5f   265715:
 49803795eb08c7fd869ee392c41d5a36e18328b2   265711:
 dfcf57a1c1707da2be5deeee931b42e6a886c1b1 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 40a00f91ac95..f1a369fdfe1c 100644
--- 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
index 690c93f76ae4..501e16b9c2ab 100644
--- 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;