[kernel] revert 15922 - add back 2.6.29 kernel support
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.29 / 208-rtl8110sb_fix.patch
1 --- a/drivers/net/r8169.c
2 +++ b/drivers/net/r8169.c
3 @@ -1890,7 +1890,7 @@ static const struct rtl_cfg_info {
4                 .hw_start       = rtl_hw_start_8169,
5                 .region         = 1,
6                 .align          = 0,
7 -               .intr_event     = SYSErr | LinkChg | RxOverflow |
8 +               .intr_event     = LinkChg | RxOverflow |
9                                   RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
10                 .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
11                 .features       = RTL_FEATURE_GMII
12 @@ -1899,7 +1899,7 @@ static const struct rtl_cfg_info {
13                 .hw_start       = rtl_hw_start_8168,
14                 .region         = 2,
15                 .align          = 8,
16 -               .intr_event     = SYSErr | LinkChg | RxOverflow |
17 +               .intr_event     = LinkChg | RxOverflow |
18                                   TxErr | TxOK | RxOK | RxErr,
19                 .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
20                 .features       = RTL_FEATURE_GMII | RTL_FEATURE_MSI
21 @@ -1908,7 +1908,7 @@ static const struct rtl_cfg_info {
22                 .hw_start       = rtl_hw_start_8101,
23                 .region         = 2,
24                 .align          = 8,
25 -               .intr_event     = SYSErr | LinkChg | RxOverflow | PCSTimeout |
26 +               .intr_event     = LinkChg | RxOverflow | PCSTimeout |
27                                   RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
28                 .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
29                 .features       = RTL_FEATURE_MSI
30 @@ -3582,10 +3582,12 @@ static irqreturn_t rtl8169_interrupt(int
31                 goto out;
32         }
33  
34 +#if 0
35         if (unlikely(status & SYSErr)) {
36                 rtl8169_pcierr_interrupt(dev);
37                 goto out;
38         }
39 +#endif
40  
41         if (status & LinkChg)
42                 rtl8169_check_link_status(dev, tp, ioaddr);