aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/e1000_hw.h
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2011-03-11 23:43:18 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-03-12 07:09:37 -0500
commit4322e561a93ec7ee034b603a6c610e7be90d4e8a (patch)
treea3260a88662c8a2b65233513bac17faffc0f64bf /drivers/net/igb/e1000_hw.h
parent09b068d45737abb49320ab25cb4ed2916017ace7 (diff)
igb: Update NVM functions to work with i350 devices
This patch adds functions and functions pointers to accommodate differences between NVM interfaces and options for i350 devices, 82580 devices and the rest. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r--drivers/net/igb/e1000_hw.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 17569bfe3f2e..27153e8d7b16 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -336,6 +336,8 @@ struct e1000_nvm_operations {
336 s32 (*read)(struct e1000_hw *, u16, u16, u16 *); 336 s32 (*read)(struct e1000_hw *, u16, u16, u16 *);
337 void (*release)(struct e1000_hw *); 337 void (*release)(struct e1000_hw *);
338 s32 (*write)(struct e1000_hw *, u16, u16, u16 *); 338 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
339 s32 (*update)(struct e1000_hw *);
340 s32 (*validate)(struct e1000_hw *);
339}; 341};
340 342
341struct e1000_info { 343struct e1000_info {
@@ -422,7 +424,6 @@ struct e1000_phy_info {
422 424
423struct e1000_nvm_info { 425struct e1000_nvm_info {
424 struct e1000_nvm_operations ops; 426 struct e1000_nvm_operations ops;
425
426 enum e1000_nvm_type type; 427 enum e1000_nvm_type type;
427 enum e1000_nvm_override override; 428 enum e1000_nvm_override override;
428 429