Commit 103cdd1d authored Nov 09, 2012 by Wang Dongsheng Committed by David S. Miller Nov 09, 2012

gianfar: ethernet vanishes after restoring from hibernation



If a gianfar ethernet device is down prior to hibernating a
system, it will no longer be present upon system restore.

For example:

	~# ifconfig eth0 down
	~# echo disk > /sys/power/state

	  <trigger a restore from hibernation>

	~# ifconfig eth0 up
	SIOCSIFFLAGS: No such device

This happens because the restore function bails out early upon
finding devices that were not up at hibernation.  In doing so,
it never gets to the netif_device_attach call at the end of
the restore function.  Adding the netif_device_attach as done
here also makes the gfar_restore code consistent with what is
done in the gfar_resume code.

Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9532021d

drivers/net/ethernet/freescale/gianfar.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1353,8 +1353,11 @@ static int gfar_restore(struct device *dev)
		struct gfar_private *priv = dev_get_drvdata(dev);
		struct net_device *ndev = priv->ndev;

		if (!netif_running(ndev))
		if (!netif_running(ndev)) {
		netif_device_attach(ndev);

		return 0;
		}

		gfar_init_bds(ndev);
		init_registers(ndev);