]> www.infradead.org Git - users/jedix/linux-maple.git/commit
r8169: fix driver shutdown WoL regression.
authorfrançois romieu <romieu@fr.zoreil.com>
Fri, 14 Oct 2011 00:57:45 +0000 (00:57 +0000)
committerJoe Jin <joe.jin@oracle.com>
Fri, 18 May 2012 02:30:56 +0000 (10:30 +0800)
commit6a7937df05693ec566ca5e9e114b3cc3bf58593c
treedbd907404af870ac400d2225ccc74662d32f2f47
parent8ed845836d1c42133f35a59c2a98edda0b43f6c2
r8169: fix driver shutdown WoL regression.

Due to commit 92fc43b4159b518f5baae57301f26d770b0834c9 ("r8169: modify the
flow of the hw reset."), rtl8169_hw_reset stomps during driver shutdown on
RxConfig bits which are needed for WOL on some versions of the hardware.

As these bits were formerly set from the r81{0x, 68}_pll_power_down methods,
factor them out for use in the driver shutdown (rtl_shutdown) handler.

I favored __rtl8169_get_wol() -hardware state indication- over
RTL_FEATURE_WOL as the latter has become a good candidate for removal.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes <hayeswang@realtek.com>
Tested-by: Marc Ballarin <ballarin.marc@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 649b3b8c4e8681de443b4dc9e387c3036369e02e)

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