netdev
[Top] [All Lists]

[patch 2/5] r8169: C 101

To: akpm@xxxxxxxx
Subject: [patch 2/5] r8169: C 101
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
Date: Tue, 7 Dec 2004 01:15:35 +0100
Cc: netdev@xxxxxxxxxxx, jgarzik@xxxxxxxxx, Dorn Hetzel <kernel@xxxxxxxxxxxxxxx>
In-reply-to: <20041207001419.GB12838@xxxxxxxxxxxxxxxxxxxxxxxxxx>
References: <20041119162920.GA26836@xxxxxxxxxxxxxxxx> <20041119201203.GA13522@xxxxxxxxxxxxxxxxxxxxxxxxxx> <20041120003754.GA32133@xxxxxxxxxxxxxxxx> <20041120002946.GA18059@xxxxxxxxxxxxxxxxxxxxxxxxxx> <20041122181307.GA3625@xxxxxxxxxxxxxxxx> <20041205235519.GA21885@xxxxxxxxxxxxxxxx> <20041205233756.GB29236@xxxxxxxxxxxxxxxxxxxxxxxxxx> <20041207001419.GB12838@xxxxxxxxxxxxxxxxxxxxxxxxxx>
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/drivers/net/r8169.c~r8169-255      2004-12-05 
22:36:19.717006983 +0100
+++ linux-2.6.10-rc2-fr/drivers/net/r8169.c     2004-12-05 22:36:19.721006330 
+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>