1 files changed, 9 insertions, 7 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;