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, 5 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index a82b6b39d4ff..2a349004f18d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -78,8 +78,9 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
                 ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ctx->staging.channel = cpu_to_le16(priv->hw->conf.channel->hw_value);
-        priv->band = priv->hw->conf.channel->band;
+        ctx->staging.channel =
+                cpu_to_le16(priv->hw->conf.chandef.chan->hw_value);
+        priv->band = priv->hw->conf.chandef.chan->band;
 
         iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
 
@@ -951,7 +952,7 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv,
                 unsigned long basic = ctx->vif->bss_conf.basic_rates;
                 int i;
 
-                sband = priv->hw->wiphy->bands[priv->hw->conf.channel->band];
+                sband = priv->hw->wiphy->bands[priv->hw->conf.chandef.chan->band];
 
                 for_each_set_bit(i, &basic, BITS_PER_LONG) {
                         int hw = sband->bitrates[i].hw_value;
@@ -1181,7 +1182,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx;
         struct ieee80211_conf *conf = &hw->conf;
-        struct ieee80211_channel *channel = conf->channel;
+        struct ieee80211_channel *channel = conf->chandef.chan;
         int ret = 0;
 
         IWL_DEBUG_MAC80211(priv, "enter: changed %#x\n", changed);