merge mac80211, iw, hostapd from trunk to backfire

[openwrt-10.03/.git] / package / mac80211 / patches / 601-rt2x00-fix-hang-on-ifdown.patch

diff --git a/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch b/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch
index 5b1ae415ad3492bcc6d89e08b5a8b23524394c46..3bee27105f0ed66a3a5e4325658efb609035ad31 100644 (file)
--- a/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch
+++ b/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch
@@ -4,7 +4,7 @@ Date: Mon, 21 Jun 2010 10:03:05 +0200
 Subject: [PATCH] rt2x00: fix rt2800pci hang on ifdown
 
 rt2800pci hangs the system on rt305x SoC devices on ifdown. Work around
-this issue by disabling TX DMA prior to restting the TX queue indices.
+this issue by disabling TX DMA prior to resetting the TX queue indices.
 
 This patch is not suitable for upstream inclusion but is just meant as
 a workaround until a proper solution is implemented.
@@ -16,14 +16,14 @@ Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
 
 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -749,6 +749,10 @@ static void rt2800pci_kill_tx_queue(stru
-               rt2800_register_write(rt2x00dev, BCN_TIME_CFG, 0);
+@@ -593,6 +593,10 @@ static void rt2800pci_kill_tx_queue(stru
                return;
        }
-+ 
+ 
 +      rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg);
 +      rt2x00_set_field32(&reg, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0);
 +      rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg);
- 
++
        rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, &reg);
-       rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, (qid == QID_AC_BE));
+       rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, (queue->qid == QID_AC_BE));
+       rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, (queue->qid == QID_AC_BK));