[cavium-octeon] update to 2.6.30-rc5

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

diff --git a/target/linux/generic-2.6/patches-2.6.23/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.23/208-rtl8110sb_fix.patch
index 9bb3f2c..331420b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/208-rtl8110sb_fix.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23/drivers/net/r8169.c
-===================================================================
---- linux-2.6.23.orig/drivers/net/r8169.c      2007-10-10 04:31:38.000000000 +0800
-+++ linux-2.6.23/drivers/net/r8169.c   2007-10-10 13:53:17.000000000 +0800
-@@ -1459,7 +1459,7 @@
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -1459,7 +1459,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,
                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,


@@ -11,7 +9,7 @@ Index: linux-2.6.23/drivers/net/r8169.c
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
        },
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
        },

-@@ -1467,7 +1467,7 @@
+@@ -1467,7 +1467,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,
                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,


@@ -20,7 +18,7 @@ Index: linux-2.6.23/drivers/net/r8169.c
                                  TxErr | TxOK | RxOK | RxErr,
                .napi_event     = TxErr | TxOK | RxOK | RxOverflow
        },
                                  TxErr | TxOK | RxOK | RxErr,
                .napi_event     = TxErr | TxOK | RxOK | RxOverflow
        },

-@@ -1475,7 +1475,7 @@
+@@ -1475,7 +1475,7 @@ static const struct rtl_cfg_info {

                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,


@@ -29,7 +27,7 @@ Index: linux-2.6.23/drivers/net/r8169.c
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
        }
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow
        }

-@@ -2779,10 +2779,12 @@
+@@ -2779,10 +2779,12 @@ static irqreturn_t rtl8169_interrupt(int

                        break;
                }
  
                        break;
                }