diff options
| author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2011-07-07 00:24:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:05 -0700 |
| commit | 0dd4154f666ec85b7befd5026342ebb77c6c06f0 (patch) | |
| tree | dc9469c20e537bf1404e58fff725dae07d134b06 /drivers/net/igb | |
| parent | 66d52cb7c42a5df2a6aded5f29dba98ac2882064 (diff) | |
| download | kernel_samsung_espresso10-0dd4154f666ec85b7befd5026342ebb77c6c06f0.tar.gz kernel_samsung_espresso10-0dd4154f666ec85b7befd5026342ebb77c6c06f0.tar.bz2 kernel_samsung_espresso10-0dd4154f666ec85b7befd5026342ebb77c6c06f0.zip | |
igb: fix WOL on second port of i350 device
commit 6d337dce664b6872ddf1655f6b1fcab76ce35b08 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 2c28621eb30..97f46ac4f21 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1985,7 +1985,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); |