aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-23 15:29:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-23 15:29:25 +0000
commit9fcc9f026b070a01c7bd1932a43f1c330668e251 (patch)
treec7d89f0cb96983e62e9f32eef62efe89eba10dc3
parentb3e708acd790b0b2d309dcf18779aabdf3e16361 (diff)
downloadupstream-9fcc9f026b070a01c7bd1932a43f1c330668e251.tar.gz
upstream-9fcc9f026b070a01c7bd1932a43f1c330668e251.tar.bz2
upstream-9fcc9f026b070a01c7bd1932a43f1c330668e251.zip
ath9k: fix an aggregation hang issue that happens when a hardware reset is issued
SVN-Revision: 23588
-rw-r--r--package/mac80211/patches/570-ath9k_reset_aggr_fix.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/package/mac80211/patches/570-ath9k_reset_aggr_fix.patch b/package/mac80211/patches/570-ath9k_reset_aggr_fix.patch
new file mode 100644
index 0000000000..d4b52ed33a
--- /dev/null
+++ b/package/mac80211/patches/570-ath9k_reset_aggr_fix.patch
@@ -0,0 +1,42 @@
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -587,7 +587,7 @@ void ath_hw_check(struct work_struct *wo
+
+ msleep(1);
+ }
+- ath_reset(sc, false);
++ ath_reset(sc, true);
+
+ out:
+ ath9k_ps_restore(sc);
+@@ -605,7 +605,7 @@ void ath9k_tasklet(unsigned long data)
+ ath9k_ps_wakeup(sc);
+
+ if (status & ATH9K_INT_FATAL) {
+- ath_reset(sc, false);
++ ath_reset(sc, true);
+ ath9k_ps_restore(sc);
+ return;
+ }
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -2163,7 +2163,7 @@ static void ath_tx_complete_poll_work(st
+ ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
+ "tx hung, resetting the chip\n");
+ ath9k_ps_wakeup(sc);
+- ath_reset(sc, false);
++ ath_reset(sc, true);
+ ath9k_ps_restore(sc);
+ }
+
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -370,7 +370,7 @@ void ath_beacon_tasklet(unsigned long da
+ ath_print(common, ATH_DBG_BSTUCK,
+ "beacon is officially stuck\n");
+ sc->sc_flags |= SC_OP_TSF_RESET;
+- ath_reset(sc, false);
++ ath_reset(sc, true);
+ }
+
+ return;