1 files changed, 3 insertions, 16 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 8fbde897406e..605599eb6d3f 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -212,12 +212,10 @@ static int ath_key_config(struct ath_softc *sc,
 
 static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)
 {
-#define ATH_MAX_NUM_KEYS 4
         int freeslot;
 
-        freeslot = (key->keyidx >= ATH_MAX_NUM_KEYS) ? 1 : 0;
+        freeslot = (key->keyidx >= 4) ? 1 : 0;
         ath_key_reset(sc, key->keyidx, freeslot);
-#undef ATH_MAX_NUM_KEYS
 }
 
 static void setup_ht_cap(struct ieee80211_ht_info *ht_info)
@@ -620,7 +618,8 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
         }
 
         if ((conf->changed & IEEE80211_IFCC_BEACON) &&
-            (vif->type == IEEE80211_IF_TYPE_IBSS)) {
+            ((vif->type == IEEE80211_IF_TYPE_IBSS) ||
+             (vif->type == IEEE80211_IF_TYPE_AP))) {
                 /*
                  * Allocate and setup the beacon frame.
                  *
@@ -638,18 +637,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                 ath_beacon_sync(sc, 0);
         }
 
-        if ((conf->changed & IEEE80211_IFCC_BEACON) &&
-            (vif->type == IEEE80211_IF_TYPE_AP)) {
-                ath9k_hw_stoptxdma(sc->sc_ah, sc->sc_bhalq);
-
-                error = ath_beacon_alloc(sc, 0);
-                if (error != 0)
-                        return error;
-
-                ath_beacon_config(sc, 0);
-                sc->sc_flags |= SC_OP_BEACONS;
-        }
-
         /* Check for WLAN_CAPABILITY_PRIVACY ? */
         if ((avp->av_opmode != IEEE80211_IF_TYPE_STA)) {
                 for (i = 0; i < IEEE80211_WEP_NKID; i++)