diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-07-05 15:08:56 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-07-05 15:08:56 +0000 |
| commit | 1981fd14a760e993bdbe1d65192b459595e442c4 (patch) | |
| tree | b517f824635d3d68dc79b218aed8210040d796bb /target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch | |
| parent | f74d16548d4bb98910647c8d6ab2a9198bb32955 (diff) | |
| download | upstream-1981fd14a760e993bdbe1d65192b459595e442c4.tar.gz upstream-1981fd14a760e993bdbe1d65192b459595e442c4.tar.bz2 upstream-1981fd14a760e993bdbe1d65192b459595e442c4.zip | |
bump to 2.6.29.6 and refresh patches
SVN-Revision: 16698
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch index 7f46c0b51a..305741dc33 100644 --- a/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c -@@ -1890,7 +1890,7 @@ static const struct rtl_cfg_info { +@@ -1889,7 +1889,7 @@ static const struct rtl_cfg_info { .hw_start = rtl_hw_start_8169, .region = 1, .align = 0, @@ -9,7 +9,7 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_GMII -@@ -1899,7 +1899,7 @@ static const struct rtl_cfg_info { +@@ -1898,7 +1898,7 @@ static const struct rtl_cfg_info { .hw_start = rtl_hw_start_8168, .region = 2, .align = 8, @@ -18,7 +18,7 @@ TxErr | TxOK | RxOK | RxErr, .napi_event = TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI -@@ -1908,7 +1908,7 @@ static const struct rtl_cfg_info { +@@ -1907,7 +1907,7 @@ static const struct rtl_cfg_info { .hw_start = rtl_hw_start_8101, .region = 2, .align = 8, @@ -27,16 +27,16 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_MSI -@@ -3582,10 +3582,12 @@ static irqreturn_t rtl8169_interrupt(int - goto out; - } +@@ -3576,10 +3576,12 @@ static irqreturn_t rtl8169_interrupt(int + 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); |