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

5 files changed, 14 insertions, 11 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index f5e840104f4b..7f3d461f7e8d 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -980,7 +980,7 @@ static inline int b43_is_mode(struct b43_wl *wl, int type)
  */
 static inline enum ieee80211_band b43_current_band(struct b43_wl *wl)
 {
-        return wl->hw->conf.channel->band;
+        return wl->hw->conf.chandef.chan->band;
 }
 
 static inline int b43_bus_may_powerdown(struct b43_wldev *wldev)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 4ac73d2f8605..d377f77d30b5 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3852,7 +3852,7 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
         dev = wl->current_dev;
 
         /* Switch the band (if necessary). This might change the active core. */
-        err = b43_switch_band(wl, conf->channel);
+        err = b43_switch_band(wl, conf->chandef.chan);
         if (err)
                 goto out_unlock_mutex;
 
@@ -3882,8 +3882,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
 
         /* Switch to the requested channel.
          * The firmware takes care of races with the TX handler. */
-        if (conf->channel->hw_value != phy->channel)
-                b43_switch_channel(dev, conf->channel->hw_value);
+        if (conf->chandef.chan->hw_value != phy->channel)
+                b43_switch_channel(dev, conf->chandef.chan->hw_value);
 
         dev->wl->radiotap_enabled = !!(conf->flags & IEEE80211_CONF_MONITOR);
 
@@ -5006,7 +5006,7 @@ static int b43_op_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 = dev->stats.link_noise;
 
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index b8667706fc27..83239fd87040 100644
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -1011,8 +1011,9 @@ static void b43_phy_ht_op_switch_analog(struct b43_wldev *dev, bool on)
 static int b43_phy_ht_op_switch_channel(struct b43_wldev *dev,
                                         unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))
diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index a13e28ef6246..0bafa3b17035 100644
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -808,8 +808,9 @@ static void b43_phy_lcn_op_switch_analog(struct b43_wldev *dev, bool on)
 static int b43_phy_lcn_op_switch_channel(struct b43_wldev *dev,
                                         unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index f9339e7ea6af..45d63d70a66b 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -5526,8 +5526,9 @@ static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)
 static int b43_nphy_op_switch_channel(struct b43_wldev *dev,
                                       unsigned int new_channel)
 {
-        struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
-        enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
+        struct ieee80211_channel *channel = dev->wl->hw->conf.chandef.chan;
+        enum nl80211_channel_type channel_type =
+                cfg80211_get_chandef_type(&dev->wl->hw->conf.chandef);
 
         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
                 if ((new_channel < 1) || (new_channel > 14))