diff options
| author | Wang Dongsheng <dongsheng.wang@freescale.com> | 2012-11-09 04:43:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-09 17:08:36 -0500 |
| commit | 103cdd1d59e1ab6abccb049093239cc8e6295816 (patch) | |
| tree | 4075762d176f350eb71892c3598479bfe51501da /drivers/net | |
| parent | 9532021da6da48351ce48a079c673df8e3930b4a (diff) | |
| download | linux-3.10-103cdd1d59e1ab6abccb049093239cc8e6295816.tar.gz linux-3.10-103cdd1d59e1ab6abccb049093239cc8e6295816.tar.bz2 linux-3.10-103cdd1d59e1ab6abccb049093239cc8e6295816.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 1d03dcdd5e5..19ac096cb07 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -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); |