From: Francois Romieu <romieu@fr.zoreil.com>
Back to C101 and code which gives the expected result.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/net/r8169.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/r8169.c~r8169-c-101 drivers/net/r8169.c
--- 25/drivers/net/r8169.c~r8169-c-101 2004-12-06 17:38:10.432819208 -0800
+++ 25-akpm/drivers/net/r8169.c 2004-12-06 17:38:10.437818448 -0800
@@ -1979,7 +1979,7 @@ static void rtl8169_pcierr_interrupt(str
PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT));
/* The infamous DAC f*ckup only happens at boot time */
- if ((tp->cp_cmd & PCIDAC) && (tp->dirty_rx == tp->cur_rx == 0)) {
+ if ((tp->cp_cmd & PCIDAC) && !tp->dirty_rx && !tp->cur_rx) {
printk(KERN_INFO PFX "%s: disabling PCI DAC.\n", dev->name);
tp->cp_cmd &= ~PCIDAC;
RTL_W16(CPlusCmd, tp->cp_cmd);
_