Merge git://github.com/Jkirsher/net-next

[pandora-kernel.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6026ab0..bb069bc 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6295,8 +6295,7 @@ static void ixgbe_tx_map(struct ixgbe_ring *tx_ring,
                offset = 0;
                tx_flags |= IXGBE_TX_FLAGS_MAPPED_AS_PAGE;
 
-               dma = dma_map_page(dev, frag->page, frag->page_offset,
-                                  size, DMA_TO_DEVICE);
+               dma = skb_frag_dma_map(dev, frag, 0, size, DMA_TO_DEVICE);
                if (dma_mapping_error(dev, dma))
                        goto dma_error;