e1000e: remove use of skb_dma_map from e1000e driver

In testing we have found that skb_dma_map/unmap is incompatible with HW
IOMMU due to the fact that multiple mappings will return different results.
In order to correct this we need to remove skb_dma_map/unmap calls from the
e1000e driver.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index c4e861fb3862..b9f9e7836fad 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -194,12 +194,15 @@ struct e1000_buffer {
                         unsigned long time_stamp;
                         u16 length;
                         u16 next_to_watch;
+                        u16 mapped_as_page;
                 };
                 /* Rx */
-                /* arrays of page information for packet split */
-                struct e1000_ps_page *ps_pages;
+                struct {
+                        /* arrays of page information for packet split */
+                        struct e1000_ps_page *ps_pages;
+                        struct page *page;
+                };
         };
-        struct page *page;
 };
 
 struct e1000_ring {