From: Hayes Wang <hayeswang@realtek.com>
Date: Tue, 6 Sep 2011 08:55:16 +0000 (+0800)
Subject: r8169: fix the reset setting for 8111evl
X-Git-Tag: v3.1-rc7~2^2~11^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c2b0c1e7fb69b54e704cb2dae5a80cc78a8cb0b2;p=linux.git

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>
---

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 {