--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
-@@ -1519,7 +1519,7 @@ static const struct rtl_cfg_info {
+@@ -1526,7 +1526,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
+ .intr_event = LinkChg | RxOverflow |
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- .msi = 0
-@@ -1528,7 +1528,7 @@ static const struct rtl_cfg_info {
+ .features = RTL_FEATURE_GMII
+@@ -1535,7 +1535,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
+ .intr_event = LinkChg | RxOverflow |
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
- .msi = RTL_FEATURE_MSI
-@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
+ .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
+@@ -1544,7 +1544,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
+ .intr_event = LinkChg | RxOverflow | PCSTimeout |
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
- .msi = RTL_FEATURE_MSI
-@@ -2873,10 +2873,12 @@ static irqreturn_t rtl8169_interrupt(int
- goto out;
- }
-
+ .features = RTL_FEATURE_MSI
+@@ -2872,12 +2872,12 @@ static irqreturn_t rtl8169_interrupt(int
+ rtl8169_tx_timeout(dev);
+ break;
+ }
+-
+#if 0
- if (unlikely(status & SYSErr)) {
- rtl8169_pcierr_interrupt(dev);
- goto out;
- }
+ if (unlikely(status & SYSErr)) {
+ rtl8169_pcierr_interrupt(dev);
+ break;
+ }
+-
+#endif
+ if (status & LinkChg)
+ rtl8169_check_link_status(dev, tp, ioaddr);
- if (status & LinkChg)
- rtl8169_check_link_status(dev, tp, ioaddr);