diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/net/e1000e | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index ec0b803c501e..455d5a1101ed 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -6012,7 +6012,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
| 6012 | /* APME bit in EEPROM is mapped to WUC.APME */ | 6012 | /* APME bit in EEPROM is mapped to WUC.APME */ |
| 6013 | eeprom_data = er32(WUC); | 6013 | eeprom_data = er32(WUC); |
| 6014 | eeprom_apme_mask = E1000_WUC_APME; | 6014 | eeprom_apme_mask = E1000_WUC_APME; |
| 6015 | if (eeprom_data & E1000_WUC_PHY_WAKE) | 6015 | if ((hw->mac.type > e1000_ich10lan) && |
| 6016 | (eeprom_data & E1000_WUC_PHY_WAKE)) | ||
| 6016 | adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP; | 6017 | adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP; |
| 6017 | } else if (adapter->flags & FLAG_APME_IN_CTRL3) { | 6018 | } else if (adapter->flags & FLAG_APME_IN_CTRL3) { |
| 6018 | if (adapter->flags & FLAG_APME_CHECK_PORT_B && | 6019 | if (adapter->flags & FLAG_APME_CHECK_PORT_B && |