aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-12 08:37:27 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-12 08:37:27 +0000
commiteece71be5620168afd4474f638cbcc16e48f5f13 (patch)
tree4ec4123d0b9ede34c7a1072ac25b0842d623ac93 /target/linux
parent2b378d11c879a83b3630f6cdf736919cfd367c09 (diff)
downloadupstream-eece71be5620168afd4474f638cbcc16e48f5f13.tar.gz
upstream-eece71be5620168afd4474f638cbcc16e48f5f13.tar.bz2
upstream-eece71be5620168afd4474f638cbcc16e48f5f13.zip
generic: fix 8139cp patch for 3.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34640
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.6/065-8139cp-fixes.patch20
1 files changed, 19 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.6/065-8139cp-fixes.patch b/target/linux/generic/patches-3.6/065-8139cp-fixes.patch
index 7732b277be..c79f08ac1b 100644
--- a/target/linux/generic/patches-3.6/065-8139cp-fixes.patch
+++ b/target/linux/generic/patches-3.6/065-8139cp-fixes.patch
@@ -146,7 +146,25 @@ Date: Wed Nov 21 10:27:19 2012 +0000
cp_reset_hw(cp);
-@@ -1192,6 +1230,7 @@ static void cp_tx_timeout(struct net_dev
+@@ -992,17 +1030,6 @@ static void cp_init_hw (struct cp_privat
+
+ cpw8(Config5, cpr8(Config5) & PMEStatus);
+
+- cpw32_f(HiTxRingAddr, 0);
+- cpw32_f(HiTxRingAddr + 4, 0);
+-
+- ring_dma = cp->ring_dma;
+- cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
+- cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+- ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
+- cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
+- cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
+-
+ cpw16(MultiIntr, 0);
+
+ cpw8_f(Cfg9346, Cfg9346_Lock);
+@@ -1192,6 +1219,7 @@ static void cp_tx_timeout(struct net_dev
cp_clean_rings(cp);
rc = cp_init_rings(cp);
cp_start_hw(cp);