Merge branch 'iwlwifi-fixes' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c

diff --cc drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 634bb7b7499efe21bfae03701aea28a2a81989fd,98556d03c1edabf8e521998d4eec0f4a41a89fdf..6639341b2c2ca9008013ce4fe843de849b567447
--- 1/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- 2/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -329,16 -303,6 +329,9 @@@ int iwl_mvm_mac_setup_register(struct i
                hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
        }
  
-       if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&
-           !iwlwifi_mod_params.uapsd_disable) {
-               hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;
-               hw->uapsd_queues = IWL_UAPSD_AC_INFO;
-               hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
-       }
- 
 +      if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
 +              hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
 +
        hw->sta_data_size = sizeof(struct iwl_mvm_sta);
        hw->vif_data_size = sizeof(struct iwl_mvm_vif);
        hw->chanctx_data_size = sizeof(u16);