aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/e1000.h
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2011-12-15 19:45:40 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-01-26 02:12:13 -0500
commitc5083cf6d286e4d3485eaf7904e5d60a2d9df6f5 (patch)
treede0736d8ff50800af5149ab0e84188dc71fe1900 /drivers/net/ethernet/intel/e1000e/e1000.h
parent7ee913562fb7937595ba97f9b9adbf294b657d5b (diff)
e1000e: convert head, tail and itr_register offsets to __iomem pointers
The Tx/Rx head and tail registers and itr_register are always at known addresses based on the __iomem address at which the PCI region (from BAR 0) is mapped and known offsets within the region for each of these registers. Store and use the full address rather than just the region offset to reduce unnecessary address calculations. Also, change current u8 __iomem pointers to void __iomem pointers. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/e1000.h')
-rw-r--r--drivers/net/ethernet/intel/e1000e/e1000.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index f478a22ed577..f6ac19751668 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -242,8 +242,8 @@ struct e1000_ring {
242 u16 next_to_use; 242 u16 next_to_use;
243 u16 next_to_clean; 243 u16 next_to_clean;
244 244
245 u16 head; 245 void __iomem *head;
246 u16 tail; 246 void __iomem *tail;
247 247
248 /* array of buffer information structs */ 248 /* array of buffer information structs */
249 struct e1000_buffer *buffer_info; 249 struct e1000_buffer *buffer_info;
@@ -251,7 +251,7 @@ struct e1000_ring {
251 char name[IFNAMSIZ + 5]; 251 char name[IFNAMSIZ + 5];
252 u32 ims_val; 252 u32 ims_val;
253 u32 itr_val; 253 u32 itr_val;
254 u16 itr_register; 254 void __iomem *itr_register;
255 int set_itr; 255 int set_itr;
256 256
257 struct sk_buff *rx_skb_top; 257 struct sk_buff *rx_skb_top;