diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-06-28 17:23:28 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-06-28 17:23:28 +0000 |
| commit | 3b428936ad7386010d0beed1d31011e534ef3d14 (patch) | |
| tree | 20da82d47f33db2e71981bffe07de44fa2bfffe1 /package/mac80211 | |
| parent | dfa85e2fa8398f704ee28b6d4c4ead3707ac50b8 (diff) | |
rt2x00: cleanup patches
Remove 601-rt2x00-remove-mcu-requests-for-soc.patch as an equivalent patch
is already included in upstream.
Add 601-rt2x00-fix-hang-on-ifdown.patch which is not suitable for upstream
inclusion but fixes a hang on ifdown under some circumstances and thus also
fixes AP mode operation in OpenWRT.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21975 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
| -rw-r--r-- | package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch | 34 | ||||
| -rw-r--r-- | package/mac80211/patches/601-rt2x00-remove-mcu-requests-for-soc.patch | 29 |
2 files changed, 34 insertions, 29 deletions
diff --git a/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch b/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch new file mode 100644 index 0000000000..a584d00098 --- /dev/null +++ b/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch @@ -0,0 +1,34 @@ +From 27ed5ec6924c17b76d65b697a162bafee7bd8e4e Mon Sep 17 00:00:00 2001 +From: Helmut Schaa <helmut.schaa@googlemail.com> +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 patch is not suitable for upstream inclusion but is just meant as +a workaround until a proper solution is implemented. + +Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> +--- + drivers/net/wireless/rt2x00/rt2800pci.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c +index 165da7b..bb35350 100644 +--- a/drivers/net/wireless/rt2x00/rt2800pci.c ++++ b/drivers/net/wireless/rt2x00/rt2800pci.c +@@ -737,6 +737,10 @@ static void rt2800pci_kill_tx_queue(struct rt2x00_dev *rt2x00dev, + rt2800_register_write(rt2x00dev, BCN_TIME_CFG, 0); + return; + } ++ ++ rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, ®); ++ rt2x00_set_field32(®, WPDMA_GLO_CFG_ENABLE_TX_DMA, 0); ++ rt2800_register_write(rt2x00dev, WPDMA_GLO_CFG, reg); + + rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, ®); + rt2x00_set_field32(®, WPDMA_RST_IDX_DTX_IDX0, (qid == QID_AC_BE)); +-- +1.6.4.2 + diff --git a/package/mac80211/patches/601-rt2x00-remove-mcu-requests-for-soc.patch b/package/mac80211/patches/601-rt2x00-remove-mcu-requests-for-soc.patch deleted file mode 100644 index e743af3d30..0000000000 --- a/package/mac80211/patches/601-rt2x00-remove-mcu-requests-for-soc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f18d4463d092162f34a8bd226505627ceeac3e8a Mon Sep 17 00:00:00 2001 -From: Luis Correia <luis.f.correia@gmail.com> -Date: Sat, 3 Apr 2010 12:49:53 +0100 -Subject: [PATCH] rt2x00: remove MCU requests for SoC platforms - -The ralink SoC platforms do not have an MCU. - -Signed-off-by: Luis Correia <luis.f.correia@gmail.com> -Acked-by: Ivo van Doorn <IvDoorn@gmail.com> -Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> ---- - drivers/net/wireless/rt2x00/rt2800pci.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt2800pci.c -+++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -66,6 +66,12 @@ static void rt2800pci_mcu_status(struct - if (rt2x00_is_soc(rt2x00dev)) - return; - -+ /* -+ * SOC devices don't support MCU requests. -+ */ -+ if (rt2x00_is_soc(rt2x00dev)) -+ return; -+ - for (i = 0; i < 200; i++) { - rt2800_register_read(rt2x00dev, H2M_MAILBOX_CID, ®); - |