From: Florian Fainelli Date: Mon, 11 Aug 2014 21:50:45 +0000 (-0700) Subject: net: bcmgenet: correctly resume adapter from Wake-on-LAN X-Git-Tag: omap-for-v3.17/fixes-against-rc2~76^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98bb7399d29a53a58f497409f98acb3bc0434ded;p=pandora-kernel.git net: bcmgenet: correctly resume adapter from Wake-on-LAN In case we configured the adapter to be a wake up source from Wake-on-LAN, but we never actually woke up using Wake-on-LAN, we will leave the adapter in MagicPacket matching mode, which prevents any other type of packets from reaching the RX engine. Fix this by calling bcmgenet_power_up() with GENET_POWER_WOL_MAGIC to restore the adapter configuration in bcmgenet_resume(). The second problem we had was an imbalanced clock disabling in bcmgenet_wol_resume(), the Wake-on-LAN slow clock is only enabled in bcmgenet_suspend() if we configured Wake-on-LAN, yet we unconditionally disabled the clock in bcmgenet_wol_resume(). Fixes: 8c90db72f926 ("net: bcmgenet: suspend and resume from Wake-on-LAN") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller --- Reading git-diff-tree failed