Message ID | 201411091918.04036.linux@rainbow-software.org |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
Ondrej Zary <linux@rainbow-software.org> : [...] > > Looks like this laptop is probably WoL-capable even on battery. > > > > Measured the current from AC adapter: > > around 20mA with WoL inactive (shut down from Windows or by power button in > > GRUB) around 40mA with WoL active (shut down from Linux) > > > > So to work-around this problem, users must disable WoL manually on each > > boot. Or configure udev so that ethtool disables WoL. The current policy has been here for ages. Some users may rely on it. There must be some strong rationale for their setup to have to be changed.
On Monday 10 November 2014, Francois Romieu wrote: > Ondrej Zary <linux@rainbow-software.org> : > [...] > > > > Looks like this laptop is probably WoL-capable even on battery. > > > > > > Measured the current from AC adapter: > > > around 20mA with WoL inactive (shut down from Windows or by power > > > button in GRUB) around 40mA with WoL active (shut down from Linux) > > > > > > So to work-around this problem, users must disable WoL manually on each > > > boot. > > Or configure udev so that ethtool disables WoL. This is inconsistent with other (non-Intel) ethernet drivers where users need to use ethtool only if they want to enable WoL. Installing ethtool and writing udev rules just to make a laptop shutdown properly is not very user-friendly. > The current policy has been here for ages. Some users may rely on it. > > There must be some strong rationale for their setup to have to be changed. Yes, that might be a problem.
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 781065e..bd4fe64 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2949,13 +2949,6 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } } - /* Wol magic packet can be enabled from eeprom */ - if ((nic->mac >= mac_82558_D101_A4) && - (nic->eeprom[eeprom_id] & eeprom_id_wol)) { - nic->flags |= wol_magic; - device_set_wakeup_enable(&pdev->dev, true); - } - /* ack any pending wake events, disable PME */ pci_pme_active(pdev, false);