Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6833d070 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2016-09-15-2' of... 

Merge tag 'iwlwifi-next-for-kalle-2016-09-15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* work for new hardware support continues
* dynamic queue allocation stabilization
* improvements in the MSIx code
* multiqueue support work continues
* new firmware version support
* general cleanups and improvements
parents fd9527f4 fd659f8e

drivers/net/wireless/intel/iwlwifi/dvm/ucode.c

+1 −10
Original line number Diff line number Diff line
@@ -46,15 +46,6 @@ 
 *

 ******************************************************************************/



static inline const struct fw_img *

iwl_get_ucode_image(struct iwl_priv *priv, enum iwl_ucode_type ucode_type)

{

	if (ucode_type >= IWL_UCODE_TYPE_MAX)

		return NULL;



	return &priv->fw->img[ucode_type];

}



/*

 *  Calibration

 */
@@ -330,7 +321,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, 
	enum iwl_ucode_type old_type;

	static const u16 alive_cmd[] = { REPLY_ALIVE };



	fw = iwl_get_ucode_image(priv, ucode_type);

	fw = iwl_get_ucode_image(priv->fw, ucode_type);

	if (WARN_ON(!fw))

		return -EINVAL;

drivers/net/wireless/intel/iwlwifi/iwl-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	24

#define IWL3168_UCODE_API_MAX	24

#define IWL7265D_UCODE_API_MAX	26

#define IWL3168_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	16

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

+13 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	24

#define IWL8265_UCODE_API_MAX	24

#define IWL8000_UCODE_API_MAX	26

#define IWL8265_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	16
@@ -212,6 +212,17 @@ const struct iwl_cfg iwl8265_2ac_cfg = { 
	.vht_mu_mimo_supported = true,

};



const struct iwl_cfg iwl8275_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 8275",

	.fw_name_pre = IWL8265_FW_PRE,

	IWL_DEVICE_8265,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.vht_mu_mimo_supported = true,

};



const struct iwl_cfg iwl4165_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 4165",

	.fw_name_pre = IWL8000_FW_PRE,

drivers/net/wireless/intel/iwlwifi/iwl-9000.c

+12 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	24

#define IWL9000_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	16
@@ -187,6 +187,17 @@ const struct iwl_cfg iwl9460_2ac_cfg = { 
	.integrated = true,

};



const struct iwl_cfg iwl9560_2ac_cfg = {

	.name = "Intel(R) Dual Band Wireless AC 9560",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.ht_params = &iwl9000_ht_params,

	.nvm_ver = IWL9000_NVM_VERSION,

	.nvm_calib_ver = IWL9000_TX_POWER_VERSION,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.integrated = true,

};



/*

 * TODO the struct below is for internal testing only this should be

 * removed by EO 2016~

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL_A000_UCODE_API_MAX	24

#define IWL_A000_UCODE_API_MAX	26



/* Lowest firmware API version supported */

#define IWL_A000_UCODE_API_MIN	24