3 files changed, 14 insertions, 10 deletions

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index cb366adc820b..f50a6bc5d06e 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -219,12 +219,15 @@ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_vif *avp = (void *)vif->drv_priv;
         struct ath_buf *bf = avp->av_bcbuf;
+        struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;
 
         ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
                 avp->av_bslot);
 
         tasklet_disable(&sc->bcon_tasklet);
 
+        cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
+
         if (bf && bf->bf_mpdu) {
                 struct sk_buff *skb = bf->bf_mpdu;
                 dma_unmap_single(sc->dev, bf->bf_buf_addr,
@@ -521,8 +524,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,
         }
 
         if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-                if ((vif->type != NL80211_IFTYPE_AP) ||
-                    (sc->nbcnvifs > 1)) {
+                if (vif->type != NL80211_IFTYPE_AP) {
                         ath_dbg(common, CONFIG,
                                 "An AP interface is already present !\n");
                         return false;
@@ -616,12 +618,14 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
          * enabling/disabling SWBA.
          */
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                if (!bss_conf->enable_beacon &&
-                    (sc->nbcnvifs <= 1)) {
-                        cur_conf->enable_beacon = false;
-                } else if (bss_conf->enable_beacon) {
-                        cur_conf->enable_beacon = true;
-                        ath9k_cache_beacon_config(sc, ctx, bss_conf);
+                bool enabled = cur_conf->enable_beacon;
+
+                if (!bss_conf->enable_beacon) {
+                        cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
+                } else {
+                        cur_conf->enable_beacon |= BIT(avp->av_bslot);
+                        if (!enabled)
+                                ath9k_cache_beacon_config(sc, ctx, bss_conf);
                 }
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/common.h b/drivers/net/wireless/ath/ath9k/common.h
index 2b79a568e803..d23737342f4f 100644
--- a/drivers/net/wireless/ath/ath9k/common.h
+++ b/drivers/net/wireless/ath/ath9k/common.h
@@ -54,7 +54,7 @@ struct ath_beacon_config {
         u16 dtim_period;
         u16 bmiss_timeout;
         u8 dtim_count;
-        bool enable_beacon;
+        u8 enable_beacon;
         bool ibss_creator;
         u32 nexttbtt;
         u32 intval;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 60aa8d71e753..8529014e1a5e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -424,7 +424,7 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
         ah->power_mode = ATH9K_PM_UNDEFINED;
         ah->htc_reset_init = true;
 
-        ah->tpc_enabled = true;
+        ah->tpc_enabled = false;
 
         ah->ani_function = ATH9K_ANI_ALL;
         if (!AR_SREV_9300_20_OR_LATER(ah))