netdev
[Top] [All Lists]

[PATCH 2.6.10-rc2-netdev1 2/4] r8169: C made easy

To: jgarzik@xxxxxxxxx
Subject: [PATCH 2.6.10-rc2-netdev1 2/4] r8169: C made easy
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
Date: Tue, 16 Nov 2004 23:33:32 +0100
Cc: netdev@xxxxxxxxxxx
In-reply-to: <20041116223040.GA16715@electric-eye.fr.zoreil.com>
References: <20041116223040.GA16715@electric-eye.fr.zoreil.com>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: Mutt/1.4.1i
Back to C101 and code which gives the expected result.

Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>

diff -puN drivers/net/r8169.c~r8169-255 drivers/net/r8169.c
--- linux-2.6.10-rc2-mm1.orig/drivers/net/r8169.c~r8169-255     2004-11-16 
20:23:48.000000000 +0100
+++ linux-2.6.10-rc2-mm1/drivers/net/r8169.c    2004-11-16 22:26:14.000000000 
+0100
@@ -1978,7 +1978,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);

_

<Prev in Thread] Current Thread [Next in Thread>