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

Commit 65400a53 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-01-22' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-01-22' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* more work for new devices (4165 / 8260)
* cleanups / improvemnts in rate control
* fixes for TDLS
* major statistics work from Johannes - more to come
* improvements for the fw error dump infrastructure
* usual amount of small fixes here and there (scan, D0i3 etc...)
parents 6b03e32d 0b83795a

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

+3 −3
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	10

#define IWL3160_UCODE_API_MAX	10

#define IWL7260_UCODE_API_MAX	12

#define IWL3160_UCODE_API_MAX	12



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	10
@@ -111,7 +111,7 @@ 
#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define IWL7265D_FW_PRE "iwlwifi-7265D-"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0

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

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



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	10

#define IWL8000_UCODE_API_MAX	12



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	10
@@ -84,6 +84,8 @@ 
/* Memory offsets and lengths */

#define IWL8260_DCCM_OFFSET		0x800000

#define IWL8260_DCCM_LEN		0x18000

#define IWL8260_DCCM2_OFFSET		0x880000

#define IWL8260_DCCM2_LEN		0x8000

#define IWL8260_SMEM_OFFSET		0x400000

#define IWL8260_SMEM_LEN		0x68000
@@ -134,6 +136,8 @@ static const struct iwl_ht_params iwl8000_ht_params = { 
	.non_shared_ant = ANT_A,				\

	.dccm_offset = IWL8260_DCCM_OFFSET,			\

	.dccm_len = IWL8260_DCCM_LEN,				\

	.dccm2_offset = IWL8260_DCCM2_OFFSET,			\

	.dccm2_len = IWL8260_DCCM2_LEN,				\

	.smem_offset = IWL8260_SMEM_OFFSET,			\

	.smem_len = IWL8260_SMEM_LEN
@@ -156,6 +160,16 @@ const struct iwl_cfg iwl8260_2ac_cfg = { 
	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};



const struct iwl_cfg iwl4165_2ac_cfg = {

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

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8000,

	.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,

};



const struct iwl_cfg iwl8260_2ac_sdio_cfg = {

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

	.fw_name_pre = IWL8000_FW_PRE,

drivers/net/wireless/iwlwifi/iwl-config.h

+5 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ struct iwl_pwr_tx_backoff { 
 *	station can receive in VHT

 * @dccm_offset: offset from which DCCM begins

 * @dccm_len: length of DCCM (including runtime stack CCM)

 * @dccm2_offset: offset from which the second DCCM begins

 * @dccm2_len: length of the second DCCM

 * @smem_offset: offset from which the SMEM begins

 * @smem_len: the length of SMEM

 *
@@ -310,6 +312,8 @@ struct iwl_cfg { 
	unsigned int max_vht_ampdu_exponent;

	const u32 dccm_offset;

	const u32 dccm_len;

	const u32 dccm2_offset;

	const u32 dccm2_len;

	const u32 smem_offset;

	const u32 smem_len;

};
@@ -378,6 +382,7 @@ extern const struct iwl_cfg iwl7265d_2n_cfg; 
extern const struct iwl_cfg iwl7265d_n_cfg;

extern const struct iwl_cfg iwl8260_2n_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;

#endif /* CONFIG_IWLMVM */

drivers/net/wireless/iwlwifi/iwl-csr.h

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ 
enum {

	SILICON_A_STEP = 0,

	SILICON_B_STEP,

	SILICON_C_STEP,

};

drivers/net/wireless/iwlwifi/iwl-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1490,7 +1490,7 @@ module_param_named(d0i3_disable, iwlwifi_mod_params.d0i3_disable, 
MODULE_PARM_DESC(d0i3_disable, "disable d0i3 functionality (default: Y)");



module_param_named(uapsd_disable, iwlwifi_mod_params.uapsd_disable,

		   bool, S_IRUGO);

		   bool, S_IRUGO | S_IWUSR);

#ifdef CONFIG_IWLWIFI_UAPSD

MODULE_PARM_DESC(uapsd_disable, "disable U-APSD functionality (default: N)");

#else