Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux...

* More work on the RX path for the 9000 device series
* Some more dynamic queue allocation work
* A few bugfixes and other improvements

diff --combined drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index f52ff75,5c5b9f2..292fc8b
--- 1/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- 2/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@@ -1253,10 -1253,7 +1253,10 @@@ static void iwl_req_fw_callback(const s
        if (err)
                goto try_again;
  
 -      api_ver = drv->fw.ucode_ver;
 +      if (fw_has_api(&drv->fw.ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION))
 +              api_ver = drv->fw.ucode_ver;
 +      else
 +              api_ver = IWL_UCODE_API(drv->fw.ucode_ver);
  
        /*
         * api_ver should match the api version forming part of the
@@@ -1658,7 -1655,8 +1658,8 @@@ MODULE_PARM_DESC(11n_disable
        "disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX");
  module_param_named(amsdu_size, iwlwifi_mod_params.amsdu_size,
                   int, S_IRUGO);
- MODULE_PARM_DESC(amsdu_size, "amsdu size 0:4K 1:8K 2:12K (default 0)");
+ MODULE_PARM_DESC(amsdu_size,
+                "amsdu size 0: 12K for multi Rx queue devices, 4K for other devices 1:4K 2:8K 3:12K (default 0)");
  module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, bool, S_IRUGO);
  MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");
  

diff --combined drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
index 37dc09e,eb18de8..4018e65
--- 1/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
--- 2/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
@@@ -251,7 -251,6 +251,7 @@@ typedef unsigned int __bitwise__ iwl_uc
   * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.
   * @IWL_UCODE_TLV_API_WIDE_CMD_HDR: ucode supports wide command header
   * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params
 + * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format
   * @IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY: scan APIs use 8-level priority
   *    instead of 3.
   * @IWL_UCODE_TLV_API_TX_POWER_CHAIN: TX power API has larger command size
@@@ -264,7 -263,6 +264,7 @@@ enum iwl_ucode_tlv_api 
        IWL_UCODE_TLV_API_WIFI_MCC_UPDATE       = (__force iwl_ucode_tlv_api_t)9,
        IWL_UCODE_TLV_API_WIDE_CMD_HDR          = (__force iwl_ucode_tlv_api_t)14,
        IWL_UCODE_TLV_API_LQ_SS_PARAMS          = (__force iwl_ucode_tlv_api_t)18,
 +      IWL_UCODE_TLV_API_NEW_VERSION           = (__force iwl_ucode_tlv_api_t)20,
        IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY     = (__force iwl_ucode_tlv_api_t)24,
        IWL_UCODE_TLV_API_TX_POWER_CHAIN        = (__force iwl_ucode_tlv_api_t)27,
  
@@@ -301,7 -299,8 +301,8 @@@ typedef unsigned int __bitwise__ iwl_uc
   * @IWL_UCODE_TLV_CAPA_DC2DC_SUPPORT: supports DC2DC Command
   * @IWL_UCODE_TLV_CAPA_CSUM_SUPPORT: supports TCP Checksum Offload
   * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics
-  * @IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD: support p2p standalone U-APSD
+  * @IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD: supports U-APSD on p2p interface when it
+  *    is standalone or with a BSS station interface in the same binding.
   * @IWL_UCODE_TLV_CAPA_BT_COEX_PLCR: enabled BT Coex packet level co-running
   * @IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC: ucode supports LAR updates with different
   *    sources for the MCC. This TLV bit is a future replacement to
@@@ -312,6 -311,9 +313,9 @@@
   * @IWL_UCODE_TLV_CAPA_EXTENDED_DTS_MEASURE: extended DTS measurement
   * @IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS: supports short PM timeouts
   * @IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT: supports bt-coex Multi-priority LUT
+  * @IWL_UCODE_TLV_CAPA_CSA_AND_TBTT_OFFLOAD: the firmware supports CSA
+  *    countdown offloading. Beacon notifications are not sent to the host.
+  *    The fw also offloads TBTT alignment.
   * @IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION: firmware will decide on what
   *    antenna the beacon should be transmitted
   * @IWL_UCODE_TLV_CAPA_BEACON_STORING: firmware will store the latest beacon
@@@ -347,7 -349,7 +351,7 @@@ enum iwl_ucode_tlv_capa 
        IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT         = (__force iwl_ucode_tlv_capa_t)19,
        IWL_UCODE_TLV_CAPA_CSUM_SUPPORT                 = (__force iwl_ucode_tlv_capa_t)21,
        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS           = (__force iwl_ucode_tlv_capa_t)22,
-       IWL_UCODE_TLV_CAPA_P2P_STANDALONE_UAPSD         = (__force iwl_ucode_tlv_capa_t)26,
+       IWL_UCODE_TLV_CAPA_P2P_SCM_UAPSD                = (__force iwl_ucode_tlv_capa_t)26,
        IWL_UCODE_TLV_CAPA_BT_COEX_PLCR                 = (__force iwl_ucode_tlv_capa_t)28,
        IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC                = (__force iwl_ucode_tlv_capa_t)29,
        IWL_UCODE_TLV_CAPA_BT_COEX_RRC                  = (__force iwl_ucode_tlv_capa_t)30,
@@@ -356,6 -358,7 +360,7 @@@
        IWL_UCODE_TLV_CAPA_SHORT_PM_TIMEOUTS            = (__force iwl_ucode_tlv_capa_t)65,
        IWL_UCODE_TLV_CAPA_BT_MPLUT_SUPPORT             = (__force iwl_ucode_tlv_capa_t)67,
        IWL_UCODE_TLV_CAPA_MULTI_QUEUE_RX_SUPPORT       = (__force iwl_ucode_tlv_capa_t)68,
+       IWL_UCODE_TLV_CAPA_CSA_AND_TBTT_OFFLOAD         = (__force iwl_ucode_tlv_capa_t)70,
        IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION         = (__force iwl_ucode_tlv_capa_t)71,
        IWL_UCODE_TLV_CAPA_BEACON_STORING               = (__force iwl_ucode_tlv_capa_t)72,
        IWL_UCODE_TLV_CAPA_LAR_SUPPORT_V2               = (__force iwl_ucode_tlv_capa_t)73,