Cycle hardware enable/disable routines to support WOL from S5 if cont…

…roller already disabled.

IntelMausiEthernet/IntelMausiEthernet.cpp

@@ -302,7 +302,7 @@ bool IntelMausi::start(IOService *provider)
         goto error3;
     }
 
-    if (provider->getProperty("disable-wol-from-shutdown"))
+    if (pciDevice->getProperty("disable-wol-from-shutdown"))
         wolPwrOff = false;
 
     pciDevice->close(this);
@@ -420,13 +420,7 @@ void IntelMausi::systemWillShutdown(IOOptionBits specifier)
 
     if ((kIOMessageSystemWillPowerOff | kIOMessageSystemWillRestart) & specifier) {
         setWakeOnLanFromShutdown();
-
-        /* Call intelDisable to set WOL from S5 if contoller already
-        disabled otherwise call disable at shutdown if required. */
-        if (!isEnabled && wolActive)
-            intelDisable();
-        else
-            disable(netif);
+        disable(netif);
 
         /* Restore the original MAC address. */
         adapterData.hw.mac.ops.rar_set(&adapterData.hw, adapterData.hw.mac.perm_addr, 0);
@@ -1027,7 +1021,12 @@ void IntelMausi::setWakeOnLanFromShutdown()
 
         if (kIOEthernetWakeOnMagicPacket & wakeSetting) {
             wolActive = true;
-            DebugLog("Ethernet [IntelMausi]: Wake On LAN from shutdown enabled.\n");
+            DebugLog("Ethernet [IntelMausi]: Wake on magic packet enabled.\n");
+        }
+        if (!isEnabled && wolActive) {
+            intelEnable();
+            intelDisable();
+            DebugLog("Ethernet [IntelMausi]: Wake On LAN from shutdown active.\n");
         }
     }
 

IntelMausiEthernet/IntelMausiEthernet.h

@@ -402,8 +402,9 @@ class IntelMausi : public super
     /* timer action */
     void timerAction(IOTimerEventSource *timer);
 
-    /* Set wolActive prior to shutdown or restart to support WOL
-     from S5 if "Wake for network access" or "WOMP" is enabled. */
+    /* Set wolActive prior to shutdown or restart to support WOL from S5
+     if "Wake for network access" or "WOMP" is enabled and run the hardware
+     enable/disable routines if the controller is already disabled. */
     void setWakeOnLanFromShutdown();
 
 private: