Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[deliverable/linux.git] / drivers / net / wireless / ath / carl9170 / main.c

diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 699c557bc2c778bf51494626a6b0b6d6056dd1da..e9010a481dfdf475d61f567bb0f5f11f2e44dded 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -929,6 +929,9 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
        }
 
        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+               enum nl80211_channel_type channel_type =
+                       cfg80211_get_chandef_type(&hw->conf.chandef);
+
                /* adjust slot time for 5 GHz */
                err = carl9170_set_slot_time(ar);
                if (err)
@@ -938,8 +941,8 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                if (err)
                        goto out;
 
-               err = carl9170_set_channel(ar, hw->conf.channel,
-                                          hw->conf.channel_type);
+               err = carl9170_set_channel(ar, hw->conf.chandef.chan,
+                                          channel_type);
                if (err)
                        goto out;
 
@@ -957,7 +960,7 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
        }
 
        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-               err = carl9170_set_mac_tpc(ar, ar->hw->conf.channel);
+               err = carl9170_set_mac_tpc(ar, ar->hw->conf.chandef.chan);
                if (err)
                        goto out;
        }