IB: nes: convert to SKB paged frag API.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: linux-rdma@vger.kernel.org
Cc: netdev@vger.kernel.org
Acked-by: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 66e12298d91702255cd7cee190e765836b9eb4c8..96cb35a8e31761db45a13be7e338a2e36d442ddf 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -441,11 +441,11 @@ static int nes_nic_send(struct sk_buff *skb, struct net_device *netdev)
                nesnic->tx_skb[nesnic->sq_head] = skb;
                for (skb_fragment_index = 0; skb_fragment_index < skb_shinfo(skb)->nr_frags;
                                skb_fragment_index++) {
-                       bus_address = pci_map_page( nesdev->pcidev,
-                                       skb_shinfo(skb)->frags[skb_fragment_index].page,
-                                       skb_shinfo(skb)->frags[skb_fragment_index].page_offset,
-                                       skb_shinfo(skb)->frags[skb_fragment_index].size,
-                                       PCI_DMA_TODEVICE);
+                       skb_frag_t *frag =
+                               &skb_shinfo(skb)->frags[skb_fragment_index];
+                       bus_address = skb_frag_dma_map(&nesdev->pcidev->dev,
+                                                      frag, 0, frag->size,
+                                                      PCI_DMA_TODEVICE);
                        wqe_fragment_length[wqe_fragment_index] =
                                        cpu_to_le16(skb_shinfo(skb)->frags[skb_fragment_index].size);
                        set_wqe_64bit_value(nic_sqe->wqe_words, NES_NIC_SQ_WQE_FRAG0_LOW_IDX+(2*wqe_fragment_index),
@@ -561,11 +561,12 @@ tso_sq_no_longer_full:
                        /* Map all the buffers */
                        for (tso_frag_count=0; tso_frag_count < skb_shinfo(skb)->nr_frags;
                                        tso_frag_count++) {
-                               tso_bus_address[tso_frag_count] = pci_map_page( nesdev->pcidev,
-                                               skb_shinfo(skb)->frags[tso_frag_count].page,
-                                               skb_shinfo(skb)->frags[tso_frag_count].page_offset,
-                                               skb_shinfo(skb)->frags[tso_frag_count].size,
-                                               PCI_DMA_TODEVICE);
+                               skb_frag_t *frag =
+                                       &skb_shinfo(skb)->frags[tso_frag_count];
+                               tso_bus_address[tso_frag_count] =
+                                       skb_frag_dma_map(&nesdev->pcidev->dev,
+                                                        frag, 0, frag->size,
+                                                        PCI_DMA_TODEVICE);
                        }
 
                        tso_frag_index = 0;