2008-12-08 13:23:09 +00:00
|
|
|
--- a/drivers/net/r8169.c
|
|
|
|
|
+++ b/drivers/net/r8169.c
|
|
|
|
|
@@ -1862,7 +1862,7 @@ static const struct rtl_cfg_info {
|
|
|
|
|
.hw_start = rtl_hw_start_8169,
|
|
|
|
|
.region = 1,
|
|
|
|
|
.align = 0,
|
|
|
|
|
- .intr_event = SYSErr | LinkChg | RxOverflow |
|
|
|
|
|
+ .intr_event = LinkChg | RxOverflow |
|
|
|
|
|
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
|
|
|
|
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
|
|
|
|
.features = RTL_FEATURE_GMII
|
|
|
|
|
@@ -1871,7 +1871,7 @@ static const struct rtl_cfg_info {
|
|
|
|
|
.hw_start = rtl_hw_start_8168,
|
|
|
|
|
.region = 2,
|
|
|
|
|
.align = 8,
|
|
|
|
|
- .intr_event = SYSErr | LinkChg | RxOverflow |
|
|
|
|
|
+ .intr_event = LinkChg | RxOverflow |
|
|
|
|
|
TxErr | TxOK | RxOK | RxErr,
|
|
|
|
|
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
|
|
|
|
|
.features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
|
|
|
|
|
@@ -1880,7 +1880,7 @@ static const struct rtl_cfg_info {
|
|
|
|
|
.hw_start = rtl_hw_start_8101,
|
|
|
|
|
.region = 2,
|
|
|
|
|
.align = 8,
|
|
|
|
|
- .intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout |
|
|
|
|
|
+ .intr_event = LinkChg | RxOverflow | PCSTimeout |
|
|
|
|
|
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
|
|
|
|
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
|
|
|
|
.features = RTL_FEATURE_MSI
|
2009-06-08 11:31:17 +00:00
|
|
|
@@ -3554,10 +3554,12 @@ static irqreturn_t rtl8169_interrupt(int
|
2008-12-08 13:23:09 +00:00
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
|
if (unlikely(status & SYSErr)) {
|
|
|
|
|
rtl8169_pcierr_interrupt(dev);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
if (status & LinkChg)
|
|
|
|
|
rtl8169_check_link_status(dev, tp, ioaddr);
|
