Fixed Rafael's email address. Sorry about the dupe emails. On Tue, Feb 14, 2012 at 10:33 AM, Sameer Nanda <snanda@xxxxxxxxxxxx> wrote: > Fixed Francois Romieu email address. > > On Tue, Feb 14, 2012 at 10:27 AM, Sameer Nanda <snanda@xxxxxxxxxxxx> wrote: >> >> Set the WOL config registers to only enable WOL from magic packet by >> default. Without this change in place, the WOL config register >> settings on warm reboot come up in an inconsistent state since these >> registers don't get reset on a warm reboot. >> >> Signed-off-by: Sameer Nanda <snanda@xxxxxxxxxxxx> >> --- >> drivers/net/ethernet/realtek/r8169.c | 11 ++++++----- >> 1 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c >> index 7a0c800..a6921b7 100644 >> --- a/drivers/net/ethernet/realtek/r8169.c >> +++ b/drivers/net/ethernet/realtek/r8169.c >> @@ -4073,12 +4073,13 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) >> tp->txd_version = rtl_chip_infos[chipset].txd_version; >> >> RTL_W8(Cfg9346, Cfg9346_Unlock); >> + >> + /* Enable WOL from Magic Packet by default */ >> RTL_W8(Config1, RTL_R8(Config1) | PMEnable); >> - RTL_W8(Config5, RTL_R8(Config5) & PMEStatus); >> - if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) >> - tp->features |= RTL_FEATURE_WOL; >> - if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0) >> - tp->features |= RTL_FEATURE_WOL; >> + RTL_W8(Config3, MagicPacket); >> + RTL_W8(Config5, PMEStatus); >> + tp->features |= RTL_FEATURE_WOL; >> + >> tp->features |= rtl_try_msi(tp, cfg); >> RTL_W8(Cfg9346, Cfg9346_Lock); >> >> -- >> 1.7.7.3 >> > > > > -- > Sameer -- Sameer _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/linux-pm
