Merge tag 'wireless-drivers-next-2019-11-05' of git://git.kernel.org/pub/scm/linux...

Kalle Valo says:

====================
wireless-drivers-next patches for 5.5

First set of patches for 5.5. The most active driver here clearly is
rtw88, lots of patches for it. More quiet on other drivers, smaller
fixes and cleanups all over.

This pull request also has a trivial conflict, the report and example
resolution here:

https://lkml.kernel.org/r/20191031111242.50ab1eca@canb.auug.org.au

Major changes:

rtw88

* add deep power save support

* add mac80211 software tx queue (wake_tx_queue) support

* enable hardware rate control

* add TX-AMSDU support

* add NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 support

* add power tracking support

* add 802.11ac beamformee support

* add set_bitrate_mask support

* add phy_info debugfs to show Tx/Rx physical status

* add RFE type 3 support for 8822b

ath10k

* add support for hardware rfkill on devices where firmware supports it

rtl8xxxu

* add bluetooth co-existence support for single antenna

iwlwifi

* Revamp the debugging infrastructure
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/intel/iwlwifi/fw/dbg.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/fw/file.h
index 0d5bc4c,6de20e7..1554f5f
--- 1/drivers/net/wireless/intel/iwlwifi/fw/file.h
--- 2/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@@ -323,9 -320,10 +322,11 @@@ enum iwl_ucode_tlv_api 
        IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE   = (__force iwl_ucode_tlv_api_t)53,
        IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,
        IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
 +      IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG   = (__force iwl_ucode_tlv_api_t)56,
        IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP    = (__force iwl_ucode_tlv_api_t)57,
        IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER     = (__force iwl_ucode_tlv_api_t)58,
+       IWL_UCODE_TLV_API_BAND_IN_RX_DATA       = (__force iwl_ucode_tlv_api_t)59,
+ 
  
        NUM_IWL_UCODE_TLV_API
  #ifdef __CHECKER__

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-prph.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 5ca50f3,a25712c..735436f
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@@ -1405,12 -1409,12 +1409,19 @@@ static inline bool iwl_mvm_is_scan_ext_
                          IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);
  }
  
++
 +static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)
 +{
 +      return fw_has_api(&mvm->fw->ucode_capa,
 +                        IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);
 +}
 +
+ static inline bool iwl_mvm_is_band_in_rx_supported(struct iwl_mvm *mvm)
+ {
+       return fw_has_api(&mvm->fw->ucode_capa,
+                          IWL_UCODE_TLV_API_BAND_IN_RX_DATA);
+ }
+ 
  static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)
  {
        return fw_has_api(&mvm->fw->ucode_capa,

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtlwifi/ps.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/mac80211.c
Simple merge