From b82d2252031c7344ac69dc8f1e9771ab94b35397 Mon Sep 17 00:00:00 2001 From: Sujith Date: Wed, 23 Sep 2009 13:49:12 +0530 Subject: [PATCH] --- yaml --- r: 166301 b: refs/heads/master c: e31f7b96f0252e8da06df1bc7fd0f6dbc8cbec42 h: refs/heads/master i: 166299: 1e89a6b52bb993bf24837f8eef40907ef17c44bb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 44a9b855af8e..dde163c7b129 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33e2fb2f2b5d3b2f491fccab0ead256e34447cc6 +refs/heads/master: e31f7b96f0252e8da06df1bc7fd0f6dbc8cbec42 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index 5055f1842b89..52bed89063d4 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -1226,11 +1226,6 @@ static void ath9k_rfkill_poll_state(struct ieee80211_hw *hw) bool blocked = !!ath_is_rfkill_set(sc); wiphy_rfkill_set_hw_state(hw->wiphy, blocked); - - if (blocked) - ath_radio_disable(sc); - else - ath_radio_enable(sc); } static void ath_start_rfkill_poll(struct ath_softc *sc) @@ -1260,6 +1255,7 @@ void ath_detach(struct ath_softc *sc) DPRINTF(sc, ATH_DBG_CONFIG, "Detach ATH hw\n"); ath_deinit_leds(sc); + wiphy_rfkill_stop_polling(sc->hw->wiphy); for (i = 0; i < sc->num_sec_wiphy; i++) { struct ath_wiphy *aphy = sc->sec_wiphy[i]; @@ -2166,8 +2162,6 @@ static void ath9k_stop(struct ieee80211_hw *hw) } else sc->rx.rxlink = NULL; - wiphy_rfkill_stop_polling(sc->hw->wiphy); - /* disable HAL and put h/w to sleep */ ath9k_hw_disable(sc->sc_ah); ath9k_hw_configpcipowersave(sc->sc_ah, 1, 1);