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

1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 956c1084ebf1..ee1778cf270f 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2852,7 +2852,9 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
                                      struct ieee80211_conf *conf,
                                      unsigned short pwr)
 {
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&conf->chandef);
         struct mwl8k_cmd_tx_power *cmd;
         int rc;
         int i;
@@ -2872,14 +2874,14 @@ static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
 
         cmd->channel = cpu_to_le16(channel->hw_value);
 
-        if (conf->channel_type == NL80211_CHAN_NO_HT ||
-            conf->channel_type == NL80211_CHAN_HT20) {
+        if (channel_type == NL80211_CHAN_NO_HT ||
+            channel_type == NL80211_CHAN_HT20) {
                 cmd->bw = cpu_to_le16(0x2);
         } else {
                 cmd->bw = cpu_to_le16(0x4);
-                if (conf->channel_type == NL80211_CHAN_HT40MINUS)
+                if (channel_type == NL80211_CHAN_HT40MINUS)
                         cmd->sub_ch = cpu_to_le16(0x3);
-                else if (conf->channel_type == NL80211_CHAN_HT40PLUS)
+                else if (channel_type == NL80211_CHAN_HT40PLUS)
                         cmd->sub_ch = cpu_to_le16(0x1);
         }
 
@@ -3023,7 +3025,9 @@ struct mwl8k_cmd_set_rf_channel {
 static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
                                     struct ieee80211_conf *conf)
 {
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&conf->chandef);
         struct mwl8k_cmd_set_rf_channel *cmd;
         int rc;
 
@@ -3041,12 +3045,12 @@ static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
         else if (channel->band == IEEE80211_BAND_5GHZ)
                 cmd->channel_flags |= cpu_to_le32(0x00000004);
 
-        if (conf->channel_type == NL80211_CHAN_NO_HT ||
-            conf->channel_type == NL80211_CHAN_HT20)
+        if (channel_type == NL80211_CHAN_NO_HT ||
+            channel_type == NL80211_CHAN_HT20)
                 cmd->channel_flags |= cpu_to_le32(0x00000080);
-        else if (conf->channel_type == NL80211_CHAN_HT40MINUS)
+        else if (channel_type == NL80211_CHAN_HT40MINUS)
                 cmd->channel_flags |= cpu_to_le32(0x000001900);
-        else if (conf->channel_type == NL80211_CHAN_HT40PLUS)
+        else if (channel_type == NL80211_CHAN_HT40PLUS)
                 cmd->channel_flags |= cpu_to_le32(0x000000900);
 
         rc = mwl8k_post_cmd(hw, &cmd->header);
@@ -3965,7 +3969,7 @@ static int mwl8k_cmd_set_new_stn_add(struct ieee80211_hw *hw,
         memcpy(cmd->mac_addr, sta->addr, ETH_ALEN);
         cmd->stn_id = cpu_to_le16(sta->aid);
         cmd->action = cpu_to_le16(MWL8K_STA_ACTION_ADD);
-        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                 rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
         else
                 rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
@@ -4400,7 +4404,7 @@ static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
         p->ht_caps = cpu_to_le16(sta->ht_cap.cap);
         p->extended_ht_caps = (sta->ht_cap.ampdu_factor & 3) |
                 ((sta->ht_cap.ampdu_density & 7) << 2);
-        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                 rates = sta->supp_rates[IEEE80211_BAND_2GHZ];
         else
                 rates = sta->supp_rates[IEEE80211_BAND_5GHZ] << 5;
@@ -4881,7 +4885,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         goto out;
                 }
 
-                if (hw->conf.channel->band == IEEE80211_BAND_2GHZ) {
+                if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ) {
                         ap_legacy_rates = ap->supp_rates[IEEE80211_BAND_2GHZ];
                 } else {
                         ap_legacy_rates =
@@ -4913,7 +4917,7 @@ mwl8k_bss_info_changed_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         if (idx)
                                 idx--;
 
-                        if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+                        if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                                 rate = mwl8k_rates_24[idx].hw_value;
                         else
                                 rate = mwl8k_rates_50[idx].hw_value;
@@ -4986,7 +4990,7 @@ mwl8k_bss_info_changed_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 if (idx)
                         idx--;
 
-                if (hw->conf.channel->band == IEEE80211_BAND_2GHZ)
+                if (hw->conf.chandef.chan->band == IEEE80211_BAND_2GHZ)
                         rate = mwl8k_rates_24[idx].hw_value;
                 else
                         rate = mwl8k_rates_50[idx].hw_value;
@@ -5259,7 +5263,7 @@ static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,
         if (idx != 0)
                 return -ENOENT;
 
-        survey->channel = conf->channel;
+        survey->channel = conf->chandef.chan;
         survey->filled = SURVEY_INFO_NOISE_DBM;
         survey->noise = priv->noise;