summaryrefslogtreecommitdiffstats
path: root/drivers/net/stmmac/dwmac1000_core.c
diff options
context:
space:
mode:
authorGiuseppe Cavallaro <peppe.cavallaro@st.com>2011-04-13 11:51:43 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-13 11:51:43 -0700
commit74ae2fd7d326750d973920c30d5269596724ca71 (patch)
treeac18819cbe8bf4bf356fd45816b6a6bea7cf2224 /drivers/net/stmmac/dwmac1000_core.c
parentb19f7f71b6fa5e0c49f65082044b8a2ff1009f00 (diff)
downloadlinux-stable-74ae2fd7d326750d973920c30d5269596724ca71.tar.gz
linux-stable-74ae2fd7d326750d973920c30d5269596724ca71.tar.bz2
linux-stable-74ae2fd7d326750d973920c30d5269596724ca71.zip
stmmac: review Wol and enable the Unicast support
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac/dwmac1000_core.c')
-rw-r--r--drivers/net/stmmac/dwmac1000_core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index 6ae4c3f4c63c..f20455cbfbbc 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -178,10 +178,11 @@ static void dwmac1000_pmt(void __iomem *ioaddr, unsigned long mode)
{
unsigned int pmt = 0;
- if (mode == WAKE_MAGIC) {
+ if (mode & WAKE_MAGIC) {
CHIP_DBG(KERN_DEBUG "GMAC: WOL Magic frame\n");
pmt |= power_down | magic_pkt_en;
- } else if (mode == WAKE_UCAST) {
+ }
+ if (mode & WAKE_UCAST) {
CHIP_DBG(KERN_DEBUG "GMAC: WOL on global unicast\n");
pmt |= global_unicast;
}