refresh kernel patches so that they apply cleanly

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

diff --git a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
index 5d48342e631a24fb1b2fd9c60fc1e3218c673e1c..98d9e5155b55e484e7025b8b6f91b3a7499594e7 100644 (file)
--- a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
@@ -1,7 +1,7 @@
-diff -Nur linux-2.6.17/drivers/net/r8169.c linux-2.6.17-owrt/drivers/net/r8169.c
---- linux-2.6.17/drivers/net/r8169.c   2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17-owrt/drivers/net/r8169.c      2006-10-27 13:18:46.000000000 +0200
-@@ -483,7 +483,7 @@
+diff -urN linux-2.6.21.1.old/drivers/net/r8169.c linux-2.6.21.1.dev/drivers/net/r8169.c
+--- linux-2.6.21.1.old/drivers/net/r8169.c     2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/net/r8169.c     2007-05-26 20:58:17.370030816 +0200
+@@ -494,7 +494,7 @@
  #endif
  
  static const u16 rtl8169_intr_mask =
@@ -10,17 +10,7 @@ diff -Nur linux-2.6.17/drivers/net/r8169.c linux-2.6.17-owrt/drivers/net/r8169.c
  static const u16 rtl8169_napi_event =
        RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
  static const unsigned int rtl8169_rx_config =
-@@ -1832,8 +1832,8 @@
-        */
-       RTL_W16(IntrMitigate, 0x0000);
- 
--      RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
-       RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr >> 32));
-+      RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
-       RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_32BIT_MASK));
-       RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32));
-       RTL_W8(Cfg9346, Cfg9346_Lock);
-@@ -2535,10 +2535,12 @@
+@@ -2652,10 +2652,12 @@
                if (!(status & rtl8169_intr_mask))
                        break;