2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index f5e6068f9b07..4d2ca490d76c 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -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;
 }
 
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 59b3b5d98efe..dbf06e9313cc 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -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;