Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 25530c8760c..4f1a05b92d2 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -677,7 +677,7 @@ static void wl12xx_get_vif_count(struct ieee80211_hw *hw,
         memset(data, 0, sizeof(*data));
         data->cur_vif = cur_vif;
 
-        ieee80211_iterate_active_interfaces(hw,
+        ieee80211_iterate_active_interfaces(hw, IEEE80211_IFACE_ITER_RESUME_ALL,
                                             wl12xx_vif_count_iter, data);
 }
 
@@ -3791,7 +3791,7 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
 
         /* Handle HT information change */
         if ((changed & BSS_CHANGED_HT) &&
-            (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {
+            (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {
                 ret = wl1271_acx_set_ht_information(wl, wlvif,
                                         bss_conf->ht_operation_mode);
                 if (ret < 0) {
@@ -3905,7 +3905,8 @@ sta_not_found:
                         u32 rates;
                         int ieoffset;
                         wlvif->aid = bss_conf->aid;
-                        wlvif->channel_type = bss_conf->channel_type;
+                        wlvif->channel_type =
+                                cfg80211_get_chandef_type(&bss_conf->chandef);
                         wlvif->beacon_int = bss_conf->beacon_int;
                         do_join = true;
                         set_assoc = true;
@@ -4071,7 +4072,7 @@ sta_not_found:
         /* Handle new association with HT. Do this after join. */
         if (sta_exists) {
                 if ((changed & BSS_CHANGED_HT) &&
-                    (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {
+                    (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {
                         ret = wl1271_acx_set_ht_capabilities(wl,
                                                              &sta_ht_cap,
                                                              true,
@@ -4098,7 +4099,7 @@ sta_not_found:
 
         /* Handle HT information change. Done after join. */
         if ((changed & BSS_CHANGED_HT) &&
-            (bss_conf->channel_type != NL80211_CHAN_NO_HT)) {
+            (bss_conf->chandef.width != NL80211_CHAN_WIDTH_20_NOHT)) {
                 ret = wl1271_acx_set_ht_information(wl, wlvif,
                                         bss_conf->ht_operation_mode);
                 if (ret < 0) {