projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
dwmac1000_core.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index
6f6bbc5
..
7df4ff1
100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@
-261,7
+261,7
@@
static void dwmac1000_pmt(struct mac_device_info *hw, unsigned long mode)
}
if (mode & WAKE_UCAST) {
pr_debug("GMAC: WOL on global unicast\n");
- pmt |=
global_unicast
;
+ pmt |=
power_down | global_unicast | wake_up_frame_en
;
}
writel(pmt, ioaddr + GMAC_PMT);