diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-11 20:14:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-11 20:14:39 +0000 |
| commit | 2b378d11c879a83b3630f6cdf736919cfd367c09 (patch) | |
| tree | 21e815df16255c352731fa91c272e82b419b096a /target/linux/generic/patches-3.6/065-8139cp-fixes.patch | |
| parent | a6112c3e8a2a0f85c1774b6aa31087af2bdf8343 (diff) | |
| download | upstream-2b378d11c879a83b3630f6cdf736919cfd367c09.tar.gz upstream-2b378d11c879a83b3630f6cdf736919cfd367c09.tar.bz2 upstream-2b378d11c879a83b3630f6cdf736919cfd367c09.zip | |
kernel: update linux 3.6 to 3.6.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34639
Diffstat (limited to 'target/linux/generic/patches-3.6/065-8139cp-fixes.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/065-8139cp-fixes.patch | 20 |
1 files changed, 1 insertions, 19 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 149fb65c73..7732b277be 100644 --- a/target/linux/generic/patches-3.6/065-8139cp-fixes.patch +++ b/target/linux/generic/patches-3.6/065-8139cp-fixes.patch @@ -146,25 +146,7 @@ Date: Wed Nov 21 10:27:19 2012 +0000 cp_reset_hw(cp); -@@ -979,17 +1017,6 @@ static void cp_init_hw (struct cp_privat - cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0))); - cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4))); - -- 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); -- - cp_start_hw(cp); - cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */ - -@@ -1192,6 +1219,7 @@ static void cp_tx_timeout(struct net_dev +@@ -1192,6 +1230,7 @@ static void cp_tx_timeout(struct net_dev cp_clean_rings(cp); rc = cp_init_rings(cp); cp_start_hw(cp); |