[kernel] fix build failure on vmlinux.lds with 2.6.31 (#6052)

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 208-rtl8110sb_fix.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
index 4d8dfeb..297db2a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/r8169.c
 +++ b/drivers/net/r8169.c
-@@ -1527,7 +1527,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,
@@ -9,7 +9,7 @@
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .features       = RTL_FEATURE_GMII
-@@ -1536,7 +1536,7 @@ static const struct rtl_cfg_info {
+@@ -1535,7 +1535,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
-@@ -1545,7 +1545,7 @@ static const struct rtl_cfg_info {
+@@ -1544,7 +1544,7 @@ static const struct rtl_cfg_info {
                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
@@ -27,16 +27,18 @@
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
                .features       = RTL_FEATURE_MSI
-@@ -2879,10 +2879,12 @@ static irqreturn_t rtl8169_interrupt(int
-               goto out;
-       }
- 
+@@ -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);