diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
| commit | c92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 (patch) | |
| tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch | |
| parent | a8131d463830012d225fa1032222c3a38b168778 (diff) | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch | 20 |
1 files changed, 5 insertions, 15 deletions
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 5d48342e6..620a9daab 100644 --- 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.19.old/drivers/net/r8169.c linux-2.6.19.dev/drivers/net/r8169.c +--- linux-2.6.19.old/drivers/net/r8169.c 2006-11-29 22:57:37.000000000 +0100 ++++ linux-2.6.19.dev/drivers/net/r8169.c 2006-12-14 03:14:01.000000000 +0100 +@@ -491,7 +491,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 @@ +@@ -2584,10 +2584,12 @@ if (!(status & rtl8169_intr_mask)) break; |