diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 22:09:54 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 22:09:54 +0400 |
| commit | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (patch) | |
| tree | 144b686bf3fd6512a55987da2d911f739646ce02 /drivers/net/wireless/ath/ath9k/common.c | |
| parent | 6fe5468f452c0c40348ebd4e737758a842286ca8 (diff) | |
| parent | ddc4db2e3d5393ede7a9222bb3b7522a603a4678 (diff) | |
| download | linux-655d8e2328a6ef6b6b514609a4c1e33508d3a1da.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/common.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c index 905f1b313961..6c78fe7ca54d 100644 --- 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; } |