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

Commit 4fbc5b20 authored by Ming Lei's avatar Ming Lei Committed by David S. Miller
Browse files

usbnet: pegasus: set wakeup enable in set_wol 



This patch calls device_set_wakeup_enable() inside set_wol
callback, so that turning on WOL from user mode utility
can make the 'wakeup' of pegasus device to be enabled, then
remote wakeup may be enabled before putting into sleep.

Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Petko Manolov <petkan@users.sourceforge.net>
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 546bfedb

drivers/net/usb/pegasus.c

+7 −1
Original line number Diff line number Diff line
@@ -1097,6 +1097,7 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
{

	pegasus_t	*pegasus = netdev_priv(dev);

	u8		reg78 = 0x04;

	int		ret;



	if (wol->wolopts & ~WOL_SUPPORTED)

		return -EINVAL;
@@ -1111,7 +1112,12 @@ pegasus_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	else

		pegasus->eth_regs[0] &= ~0x10;

	pegasus->wolopts = wol->wolopts;

	return set_register(pegasus, WakeupControl, reg78);



	ret = set_register(pegasus, WakeupControl, reg78);

	if (!ret)

		ret = device_set_wakeup_enable(&pegasus->usb->dev,

						wol->wolopts);

	return ret;

}



static inline void pegasus_reset_wol(struct net_device *dev)