Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1b86d84 authored by \"Rafael J. Wysocki\'s avatar \"Rafael J. Wysocki\ Committed by David S. Miller
Browse files

igb: Use device_set_wakeup_enable 



Since dev->power.should_wakeup bit is used by the PCI core to
decide whether the device should wake up the system from sleep
states, set/unset this bit whenever WOL is enabled/disabled using
igb_set_wol().  Accordingly, use device_can_wakeup() for checking
if wake-up is supported by the device.

Signed-off-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de126489

drivers/net/igb/igb_ethtool.c

+6 −2
Original line number Diff line number Diff line
@@ -1776,7 +1776,8 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 


	/* this function will set ->supported = 0 and return 1 if wol is not

	 * supported by this hardware */

	if (igb_wol_exclusion(adapter, wol))

	if (igb_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

		return;



	/* apply any specific unsupported masks here */
@@ -1805,7 +1806,8 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;



	if (igb_wol_exclusion(adapter, wol))

	if (igb_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

		return wol->wolopts ? -EOPNOTSUPP : 0;



	switch (hw->device_id) {
@@ -1825,6 +1827,8 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & WAKE_MAGIC)

		adapter->wol |= E1000_WUFC_MAG;



	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	return 0;

}

drivers/net/igb/igb_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, 


	/* initialize the wol settings based on the eeprom settings */

	adapter->wol = adapter->eeprom_wol;

	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);



	/* reset the hardware with the new settings */

	igb_reset(adapter);