mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

[deliverable/linux.git] / drivers / net / wireless / ath / ath9k / common.c

diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index 905f1b313961914ef3faf81aa6ed210248846196..6c78fe7ca54d4bbb0bf1d62cb67ab8e7cb6cdd05 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -133,13 +133,14 @@ EXPORT_SYMBOL(ath9k_cmn_update_ichannel);
 struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
                                               struct ath_hw *ah)
 {
-       struct ieee80211_channel *curchan = hw->conf.channel;
+       struct ieee80211_channel *curchan = hw->conf.chandef.chan;
        struct ath9k_channel *channel;
        u8 chan_idx;
 
        chan_idx = curchan->hw_value;
        channel = &ah->channels[chan_idx];
-       ath9k_cmn_update_ichannel(channel, curchan, hw->conf.channel_type);
+       ath9k_cmn_update_ichannel(channel, curchan,
+                                 cfg80211_get_chandef_type(&hw->conf.chandef));
 
        return channel;
 }