From aa166cf3e46015f46be921e52459dd6c06d1f9f6 Mon Sep 17 00:00:00 2001 From: Sujith Manoharan Date: Wed, 14 Mar 2012 14:40:31 +0530 Subject: [PATCH] --- yaml --- r: 291525 b: refs/heads/master c: 62450b88032287db805ba54de142e58052a98090 h: refs/heads/master i: 291523: e8d473c98d7718d704ad30aed5cb1f3299d6c329 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ath9k.h | 2 -- trunk/drivers/net/wireless/ath/ath9k/main.c | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e4e46e1d48de..73971b3145a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf106e14735d5e82e995c5c03bf07bce54e5d530 +refs/heads/master: 62450b88032287db805ba54de142e58052a98090 diff --git a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h index 3d8e51cd5d8f..fa5eb3080e24 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h @@ -624,8 +624,6 @@ struct ath_softc { struct ieee80211_hw *hw; struct device *dev; - int chan_idx; - int chan_is_ht; struct survey_info *cur_survey; struct survey_info survey[ATH9K_NUM_CHANNELS]; diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index db38a4e5a6e3..fe1d7961eefd 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -995,12 +995,8 @@ static int ath9k_start(struct ieee80211_hw *hw) curchan->center_freq); ath9k_ps_wakeup(sc); - mutex_lock(&sc->mutex); - /* setup initial channel */ - sc->chan_idx = curchan->hw_value; - init_channel = ath9k_cmn_get_curchannel(hw, ah); /* Reset SERDES registers */