diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 3d8e51cd5d8f..fa5eb3080e24 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -624,8 +624,6 @@ struct ath_softc { | |||
624 | struct ieee80211_hw *hw; | 624 | struct ieee80211_hw *hw; |
625 | struct device *dev; | 625 | struct device *dev; |
626 | 626 | ||
627 | int chan_idx; | ||
628 | int chan_is_ht; | ||
629 | struct survey_info *cur_survey; | 627 | struct survey_info *cur_survey; |
630 | struct survey_info survey[ATH9K_NUM_CHANNELS]; | 628 | struct survey_info survey[ATH9K_NUM_CHANNELS]; |
631 | 629 | ||
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index db38a4e5a6e3..fe1d7961eefd 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -995,12 +995,8 @@ static int ath9k_start(struct ieee80211_hw *hw) | |||
995 | curchan->center_freq); | 995 | curchan->center_freq); |
996 | 996 | ||
997 | ath9k_ps_wakeup(sc); | 997 | ath9k_ps_wakeup(sc); |
998 | |||
999 | mutex_lock(&sc->mutex); | 998 | mutex_lock(&sc->mutex); |
1000 | 999 | ||
1001 | /* setup initial channel */ | ||
1002 | sc->chan_idx = curchan->hw_value; | ||
1003 | |||
1004 | init_channel = ath9k_cmn_get_curchannel(hw, ah); | 1000 | init_channel = ath9k_cmn_get_curchannel(hw, ah); |
1005 | 1001 | ||
1006 | /* Reset SERDES registers */ | 1002 | /* Reset SERDES registers */ |