]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
r8169: fix wake on lan setting for non-8111E.
authorHayes Wang <hayeswang@realtek.com>
Wed, 6 Jul 2011 07:58:07 +0000 (15:58 +0800)
committerJoe Jin <joe.jin@oracle.com>
Fri, 18 May 2012 02:02:35 +0000 (10:02 +0800)
Only 8111E needs enable RxConfig bit 0 ~ 3 when suspending or
shutdowning for wake on lan.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
(cherry picked from commit d4ed95d796e5126bba51466dc07e287cebc8bd19)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/r8169.c

index 30e538a4a2574d2257e4de2d78947f41fb0dd15b..5431b5df6502635c3a384a41499ede49642dd182 100644 (file)
@@ -3299,8 +3299,10 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
                rtl_writephy(tp, 0x1f, 0x0000);
                rtl_writephy(tp, MII_BMCR, 0x0000);
 
-               RTL_W32(RxConfig, RTL_R32(RxConfig) |
-                       AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
+               if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
+                   tp->mac_version == RTL_GIGA_MAC_VER_33)
+                       RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |
+                               AcceptMulticast | AcceptMyPhys);
                return;
        }