Commit 2884e5cc authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller
Browse files

gianfar: Implement proper, per netdevice wakeup management 



This patch implements wakeup management for the gianfar driver.

The driver should set wakeup enable if WOL is enabled, so that
phylib won't power off an attached PHY.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09640e63

drivers/net/gianfar.c

+5 −0
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ static int gfar_probe(struct of_device *ofdev, 
		goto register_fail;

	}



	device_init_wakeup(&dev->dev,

		priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);



	/* fill out IRQ number and name fields */

	len_devname = strlen(dev->name);

	strncpy(&priv->int_name_tx[0], dev->name, len_devname);
@@ -1200,6 +1203,8 @@ static int gfar_enet_open(struct net_device *dev) 


	netif_start_queue(dev);



	device_set_wakeup_enable(&dev->dev, priv->wol_en);



	return err;

}

drivers/net/gianfar_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 


	spin_lock_irqsave(&priv->bflock, flags);

	priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0;

	device_set_wakeup_enable(&dev->dev, priv->wol_en);

	spin_unlock_irqrestore(&priv->bflock, flags);



	return 0;