aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/igb/e1000_defines.h1
-rw-r--r--drivers/net/igb/igb_main.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
index 62e378b64611..ad2d319d0f8b 100644
--- a/drivers/net/igb/e1000_defines.h
+++ b/drivers/net/igb/e1000_defines.h
@@ -512,6 +512,7 @@
512#define NVM_ID_LED_SETTINGS 0x0004 512#define NVM_ID_LED_SETTINGS 0x0004
513/* For SERDES output amplitude adjustment. */ 513/* For SERDES output amplitude adjustment. */
514#define NVM_INIT_CONTROL2_REG 0x000F 514#define NVM_INIT_CONTROL2_REG 0x000F
515#define NVM_INIT_CONTROL3_PORT_B 0x0014
515#define NVM_INIT_CONTROL3_PORT_A 0x0024 516#define NVM_INIT_CONTROL3_PORT_A 0x0024
516#define NVM_ALT_MAC_ADDR_PTR 0x0037 517#define NVM_ALT_MAC_ADDR_PTR 0x0037
517#define NVM_CHECKSUM_REG 0x003F 518#define NVM_CHECKSUM_REG 0x003F
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 5277d56e989e..f0c3a01452c8 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1351,9 +1351,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1351 * enable the ACPI Magic Packet filter 1351 * enable the ACPI Magic Packet filter
1352 */ 1352 */
1353 1353
1354 if (hw->bus.func == 0 || 1354 if (hw->bus.func == 0)
1355 hw->device_id == E1000_DEV_ID_82575EB_COPPER)
1356 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); 1355 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
1356 else if (hw->bus.func == 1)
1357 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);
1357 1358
1358 if (eeprom_data & eeprom_apme_mask) 1359 if (eeprom_data & eeprom_apme_mask)
1359 adapter->eeprom_wol |= E1000_WUFC_MAG; 1360 adapter->eeprom_wol |= E1000_WUFC_MAG;