bff468813f
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 SVN-Revision: 5789
26 lines
836 B
Diff
26 lines
836 B
Diff
diff -urN linux-2.6.19.old/drivers/net/r8169.c linux-2.6.19.dev/drivers/net/r8169.c
|
|
--- linux-2.6.19.old/drivers/net/r8169.c 2006-11-29 22:57:37.000000000 +0100
|
|
+++ linux-2.6.19.dev/drivers/net/r8169.c 2006-12-14 03:14:01.000000000 +0100
|
|
@@ -491,7 +491,7 @@
|
|
#endif
|
|
|
|
static const u16 rtl8169_intr_mask =
|
|
- SYSErr | LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
|
|
+ LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
|
|
static const u16 rtl8169_napi_event =
|
|
RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
|
|
static const unsigned int rtl8169_rx_config =
|
|
@@ -2584,10 +2584,12 @@
|
|
if (!(status & rtl8169_intr_mask))
|
|
break;
|
|
|
|
+#if 0
|
|
if (unlikely(status & SYSErr)) {
|
|
rtl8169_pcierr_interrupt(dev);
|
|
break;
|
|
}
|
|
+#endif
|
|
|
|
if (status & LinkChg)
|
|
rtl8169_check_link_status(dev, tp, ioaddr);
|