aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_ethtool.c
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2013-07-16 15:18:36 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-08-22 05:26:06 -0400
commit53b87ce37e19939c80aaeaa5e8702b521597ce3e (patch)
tree3523c63f5143d2ba67959c9a3d493c2076e9773b /drivers/net/ethernet/intel/igb/igb_ethtool.c
parentef3a009297c50876980f21060aee61e8b516a990 (diff)
igb: Add device support for flashless SKU of i210 device
This patch adds the specific device id support for versions of i210 that do not have flash installed. Signed-off-by: Carolyn Wyborny <carolyn.wyborny@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/igb/igb_ethtool.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_ethtool.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 6d861a5c729a..03137e21551d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1335,12 +1335,23 @@ static int igb_reg_test(struct igb_adapter *adapter, u64 *data)
1335 1335
1336static int igb_eeprom_test(struct igb_adapter *adapter, u64 *data) 1336static int igb_eeprom_test(struct igb_adapter *adapter, u64 *data)
1337{ 1337{
1338 struct e1000_hw *hw = &adapter->hw;
1339
1338 *data = 0; 1340 *data = 0;
1339 1341
1340 /* Validate eeprom on all parts but i211 */ 1342 /* Validate eeprom on all parts but flashless */
1341 if (adapter->hw.mac.type != e1000_i211) { 1343 switch (hw->mac.type) {
1344 case e1000_i210:
1345 case e1000_i211:
1346 if (igb_get_flash_presence_i210(hw)) {
1347 if (adapter->hw.nvm.ops.validate(&adapter->hw) < 0)
1348 *data = 2;
1349 }
1350 break;
1351 default:
1342 if (adapter->hw.nvm.ops.validate(&adapter->hw) < 0) 1352 if (adapter->hw.nvm.ops.validate(&adapter->hw) < 0)
1343 *data = 2; 1353 *data = 2;
1354 break;
1344 } 1355 }
1345 1356
1346 return *data; 1357 return *data;