]> git.baikalelectronics.ru Git - kernel.git/commit
net: bcmgenet: correctly resume adapter from Wake-on-LAN
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 11 Aug 2014 21:50:45 +0000 (14:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Aug 2014 22:10:11 +0000 (15:10 -0700)
commit8fe315e456c0efc55f07391d1b2f16843365bb72
treedebcce8f9747a00e4d46d4c90847952d1ed74360
parent330dcf2804fc9180a9530d298349e44a4cc392c3
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: c06be8fabefd ("net: bcmgenet: suspend and resume from Wake-on-LAN")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/genet/bcmgenet.c