aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/e1000.h
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-12-02 16:45:31 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-02 19:57:10 -0800
commit03b1320dfceeb093890cdd7433e910dca6225ddb (patch)
tree1cdb866369e0f3f05c7933df72f63dfed552f5ba /drivers/net/e1000e/e1000.h
parent614c12a1581687501f1b0fc721feff69b47abd92 (diff)
downloadkernel_samsung_crespo-03b1320dfceeb093890cdd7433e910dca6225ddb.zip
kernel_samsung_crespo-03b1320dfceeb093890cdd7433e910dca6225ddb.tar.gz
kernel_samsung_crespo-03b1320dfceeb093890cdd7433e910dca6225ddb.tar.bz2
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>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r--drivers/net/e1000e/e1000.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index c4e861f..b9f9e78 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 {