From 3d9ecb15d8fec787ac8d3347101afd57645e18a4 Mon Sep 17 00:00:00 2001 From: Mohammed Shafi Shajakhan Date: Tue, 14 Feb 2012 18:39:18 +0530 Subject: [PATCH] --- yaml --- r: 290653 b: refs/heads/master c: 5ce3df64a4a2849a6fc616e5957b5188daaea631 h: refs/heads/master i: 290651: e30f0b1e7d0cf7b14d9aa765b8d964efb0c684d9 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 842fae0901ab..e16ca6a58087 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cede8b64808f543fb5ed4991af330a0ae6026805 +refs/heads/master: 5ce3df64a4a2849a6fc616e5957b5188daaea631 diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index ec82e926badc..22785c77d007 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -1587,12 +1587,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) ath9k_ps_wakeup(sc); mutex_lock(&sc->mutex); - /* - * Leave this as the first check because we need to turn on the - * radio if it was disabled before prior to processing the rest - * of the changes. Likewise we must only disable the radio towards - * the end. - */ if (changed & IEEE80211_CONF_CHANGE_IDLE) { sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE); if (sc->ps_idle)