summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHayes Wang <hayeswang@realtek.com>2011-09-06 10:55:16 +0200
committerFrancois Romieu <romieu@fr.zoreil.com>2011-09-17 11:36:03 +0200
commitc2b0c1e7fb69b54e704cb2dae5a80cc78a8cb0b2 (patch)
tree40ed6b0e7fa3df6281474bff1e2099caf4724247
parentipv6: don't use inetpeer to store metrics for routes. (diff)
downloadlinux-c2b0c1e7fb69b54e704cb2dae5a80cc78a8cb0b2.tar.xz
linux-c2b0c1e7fb69b54e704cb2dae5a80cc78a8cb0b2.zip
r8169: fix the reset setting for 8111evl
rtl8111evl should stop any TLP requirement before resetting by enabling register 0x37 bit 7. Signed-off-by: Hayes Wang <hayeswang@realtek.com>
-rw-r--r--drivers/net/r8169.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 02339b3352e7..a1c90707a2dd 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3988,6 +3988,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
while (RTL_R8(TxPoll) & NPQ)
udelay(20);
} else if (tp->mac_version == RTL_GIGA_MAC_VER_34) {
+ RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
while (!(RTL_R32(TxConfig) & TXCFG_EMPTY))
udelay(100);
} else {