igb: fix WOL on second port of i350 device
authorCarolyn Wyborny <carolyn.wyborny@intel.com>
Thu, 7 Jul 2011 00:24:56 +0000 (00:24 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 4 Aug 2011 12:01:59 +0000 (05:01 -0700)
This patch fixes a problem where WOL would fail on second port of i350
device.

Reported-by: Martin Wilck <martin.wilck@ts.fujitsu.com>
Reported-by: Stefan Assmann<sassmann@redhat.com>
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>
drivers/net/igb/igb_main.c

index ae3937e8cdeff9a17594d9a5a7ca7f37d62ae1c8..40d4c405fd7e0218703c091619a632b8525cd2c6 100644 (file)
@@ -2023,7 +2023,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 
        if (hw->bus.func == 0)
                hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
-       else if (hw->mac.type == e1000_82580)
+       else if (hw->mac.type >= e1000_82580)
                hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +
                                 NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,
                                 &eeprom_data);