summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-28 22:06:44 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-28 22:06:44 +0000
commit57bd894d6995bacf1d337aaaf5d11c2925046672 (patch)
treea897f069b16bf67b7306f0a32e4404748f25f7a9
parent9176f7d5a8c221823de2930b07cc1b109de23f7c (diff)
ath9k: prevent calibration / beacons from starting too early
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28108 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/581-ath9k_merge_reset_functions.patch16
1 files changed, 10 insertions, 6 deletions
diff --git a/package/mac80211/patches/581-ath9k_merge_reset_functions.patch b/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
index 201994db4..3bafcda1d 100644
--- a/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
+++ b/package/mac80211/patches/581-ath9k_merge_reset_functions.patch
@@ -85,7 +85,7 @@
- channel->center_freq, r);
- goto ps_restore;
- }
-+static bool ath_complete_reset(struct ath_softc *sc)
++static bool ath_complete_reset(struct ath_softc *sc, bool start)
+{
+ struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(ah);
@@ -98,8 +98,12 @@
}
ath9k_cmn_update_txpow(ah, sc->curtxpow,
-@@ -299,18 +255,84 @@ static int ath_set_channel(struct ath_so
- if (!(sc->sc_flags & (SC_OP_OFFCHANNEL))) {
+@@ -296,21 +252,87 @@ static int ath_set_channel(struct ath_so
+ ath9k_hw_set_interrupts(ah, ah->imask);
+ ath9k_hw_enable_interrupts(ah);
+
+- if (!(sc->sc_flags & (SC_OP_OFFCHANNEL))) {
++ if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) && start) {
if (sc->sc_flags & SC_OP_BEACONS)
ath_set_beacon(sc);
+
@@ -154,7 +158,7 @@
+ return r;
+ }
+
-+ if (!ath_complete_reset(sc))
++ if (!ath_complete_reset(sc, true))
+ return -EIO;
+
+ return 0;
@@ -201,7 +205,7 @@
- /* Re-Enable interrupts */
- ath9k_hw_set_interrupts(ah, ah->imask);
- ath9k_hw_enable_interrupts(ah);
-+ ath_complete_reset(sc);
++ ath_complete_reset(sc, true);
/* Enable LED */
ath9k_hw_cfg_output(ah, ah->led_pin,
@@ -330,7 +334,7 @@
- ath9k_hw_enable_interrupts(ah);
- ieee80211_wake_queues(hw);
-+ if (!ath_complete_reset(sc)) {
++ if (!ath_complete_reset(sc, false)) {
+ r = -EIO;
+ spin_unlock_bh(&sc->sc_pcu_lock);
+ goto mutex_unlock;