7 files changed, 22 insertions, 30 deletions

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 4a32c15524c9..27f586afcc34 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -2911,9 +2911,10 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
 
                 frag = &skb_shinfo(skb)->frags[f];
                 len = frag->size;
-                offset = frag->page_offset;
+                offset = 0;
 
                 while (len) {
+                        unsigned long bufend;
                         i++;
                         if (unlikely(i == tx_ring->count))
                                 i = 0;
@@ -2927,18 +2928,19 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                         /* Workaround for potential 82544 hang in PCI-X.
                          * Avoid terminating buffers within evenly-aligned
                          * dwords. */
+                        bufend = (unsigned long)
+                                page_to_phys(skb_frag_page(frag));
+                        bufend += offset + size - 1;
                         if (unlikely(adapter->pcix_82544 &&
-                            !((unsigned long)(page_to_phys(frag->page) + offset
-                                              + size - 1) & 4) &&
-                            size > 4))
+                                     !(bufend & 4) &&
+                                     size > 4))
                                 size -= 4;
 
                         buffer_info->length = size;
                         buffer_info->time_stamp = jiffies;
                         buffer_info->mapped_as_page = true;
-                        buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
-                                                        offset, size,
-                                                        DMA_TO_DEVICE);
+                        buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,
+                                                offset, size, DMA_TO_DEVICE);
                         if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                                 goto dma_error;
                         buffer_info->next_to_watch = i;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 4f669995623f..78c5d21fa34b 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4677,7 +4677,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
 
                 frag = &skb_shinfo(skb)->frags[f];
                 len = frag->size;
-                offset = frag->page_offset;
+                offset = 0;
 
                 while (len) {
                         i++;
@@ -4690,9 +4690,8 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
                         buffer_info->length = size;
                         buffer_info->time_stamp = jiffies;
                         buffer_info->next_to_watch = i;
-                        buffer_info->dma = dma_map_page(&pdev->dev, frag->page,
-                                                        offset, size,
-                                                        DMA_TO_DEVICE);
+                        buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag,
+                                                offset, size, DMA_TO_DEVICE);
                         buffer_info->mapped_as_page = true;
                         if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                                 goto dma_error;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 801608497409..3cb1bc96bf70 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4174,10 +4174,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
                 buffer_info->time_stamp = jiffies;
                 buffer_info->next_to_watch = i;
                 buffer_info->mapped_as_page = true;
-                buffer_info->dma = dma_map_page(dev,
-                                                frag->page,
-                                                frag->page_offset,
-                                                len,
+                buffer_info->dma = skb_frag_dma_map(dev, frag, 0, len,
                                                 DMA_TO_DEVICE);
                 if (dma_mapping_error(dev, buffer_info->dma))
                         goto dma_error;
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index a6bdb3c744f0..b3d760b08a5f 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2061,10 +2061,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
                 buffer_info->time_stamp = jiffies;
                 buffer_info->next_to_watch = i;
                 buffer_info->mapped_as_page = true;
-                buffer_info->dma = dma_map_page(&pdev->dev,
-                                                frag->page,
-                                                frag->page_offset,
-                                                len,
+                buffer_info->dma = skb_frag_dma_map(&pdev->dev, frag, 0, len,
                                                 DMA_TO_DEVICE);
                 if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                         goto dma_error;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index b8ef2c0fc5d0..c8b9c9028bc0 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -1341,7 +1341,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
 
                 frag = &skb_shinfo(skb)->frags[f];
                 len = frag->size;
-                offset = frag->page_offset;
+                offset = 0;
 
                 while (len) {
                         i++;
@@ -1361,8 +1361,8 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb,
                         buffer_info->time_stamp = jiffies;
                         buffer_info->mapped_as_page = true;
                         buffer_info->dma =
-                                dma_map_page(&pdev->dev, frag->page,
-                                             offset, size, DMA_TO_DEVICE);
+                                skb_frag_dma_map(&pdev->dev, frag, offset, size,
+                                                 DMA_TO_DEVICE);
                         if (dma_mapping_error(&pdev->dev, buffer_info->dma))
                                 goto dma_error;
                         buffer_info->next_to_watch = 0;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a30f8266df00..d20e8040d855 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6494,8 +6494,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;
 
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 98963970206e..d72905b77aba 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2918,18 +2918,16 @@ static int ixgbevf_tx_map(struct ixgbevf_adapter *adapter,
 
                 frag = &skb_shinfo(skb)->frags[f];
                 len = min((unsigned int)frag->size, total);
-                offset = frag->page_offset;
+                offset = 0;
 
                 while (len) {
                         tx_buffer_info = &tx_ring->tx_buffer_info[i];
                         size = min(len, (unsigned int)IXGBE_MAX_DATA_PER_TXD);
 
                         tx_buffer_info->length = size;
-                        tx_buffer_info->dma = dma_map_page(&adapter->pdev->dev,
-                                                           frag->page,
-                                                           offset,
-                                                           size,
-                                                           DMA_TO_DEVICE);
+                        tx_buffer_info->dma =
+                                skb_frag_dma_map(&adapter->pdev->dev, frag,
+                                                 offset, size, DMA_TO_DEVICE);
                         tx_buffer_info->mapped_as_page = true;
                         if (dma_mapping_error(&pdev->dev, tx_buffer_info->dma))
                                 goto dma_error;