mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

Drivers that don't use chanctxes cannot perform VHT association because
they still use a "backward compatibility" pair of {ieee80211_channel,
nl80211_channel_type} in ieee80211_conf and ieee80211_local.

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
[fix kernel-doc]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index 10ee314c4229..cc87926f5055 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -379,7 +379,7 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                          u8 local_constraint_qdbm)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         struct txpwr_limits txpwr;
 
         brcms_c_channel_reg_limits(wlc_cm, chanspec, &txpwr);
@@ -404,7 +404,7 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                        struct txpwr_limits *txpwr)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         uint i;
         uint chan;
         int maxpwr;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index aa5f43fee5ed..70731d23ddb1 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -414,10 +414,10 @@ static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
                                   new_int);
         }
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                if (conf->channel_type == NL80211_CHAN_HT20 ||
-                    conf->channel_type == NL80211_CHAN_NO_HT)
+                if (conf->chandef.width == NL80211_CHAN_WIDTH_20 ||
+                    conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT)
                         err = brcms_c_set_channel(wl->wlc,
-                                                  conf->channel->hw_value);
+                                                  conf->chandef.chan->hw_value);
                 else
                         err = -ENOTSUPP;
         }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 8ef02dca8f8c..e0dc1838cd19 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -5099,7 +5099,7 @@ int brcms_c_up(struct brcms_c_info *wlc)
         wlc->pub->up = true;
 
         if (wlc->bandinit_pending) {
-                ch = wlc->pub->ieee_hw->conf.channel;
+                ch = wlc->pub->ieee_hw->conf.chandef.chan;
                 brcms_c_suspend_mac_and_wait(wlc);
                 brcms_c_set_chanspec(wlc, ch20mhz_chspec(ch->hw_value));
                 wlc->bandinit_pending = false;
@@ -7748,7 +7748,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 {
         struct bcma_device *core = wlc->hw->d11core;
-        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.chandef.chan;
         u16 chanspec;
 
         brcms_dbg_info(core, "wl%d\n", wlc->pub->unit);