From c5b3360d595d749b729e85d1ae79aa03b2bf6318 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Aug 2011 00:46:58 +0000 Subject: [PATCH] --- yaml --- r: 265713 b: refs/heads/master c: e859ce4c64dd124ec4e2da31159a89e33e7ed7fc h: refs/heads/master i: 265711: dfcf57a1c1707da2be5deeee931b42e6a886c1b1 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c12246daac0b..e83b7c3beaf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f106358b468bcbdff0a54fa96aeb5527cb2debbb +refs/heads/master: e859ce4c64dd124ec4e2da31159a89e33e7ed7fc diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index de18e4753b64..694130ebc75b 100644 --- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -1844,8 +1844,8 @@ netxen_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;