Commit 5e5c79b2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-10-18' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-10-18' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Second batch of iwlwifi patches for 4.15

* Allocate reorder buffer dynamically to save memory;
* Fix a FW dump problem in the A000 family;
* Fix for a statistics gathering issue (v2);
* Sort the list of 9000 devices to make it easier to find entries;
* A couple of cleanups in the FW dump code;
* Remove some unnecessary variables and fields and calculations;
parents aec72f33 3c798a45

drivers/net/wireless/intel/iwlwifi/cfg/8000.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.thermal_params = &iwl8000_tt_params,				\

	.apmg_not_supported = true,					\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x800000



#define IWL_DEVICE_8000							\

	IWL_DEVICE_8000_COMMON,						\

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.mac_addr_from_csr = true,					\

	.rf_id = true,							\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x800000



const struct iwl_cfg iwl9160_2ac_cfg = {

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

drivers/net/wireless/intel/iwlwifi/cfg/a000.c

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.gen2 = true,							\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.tx_cmd_queue_size = 32

	.tx_cmd_queue_size = 32,					\

	.min_umac_error_event_table = 0x400000



const struct iwl_cfg iwla000_2ac_cfg_hr = {

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

drivers/net/wireless/intel/iwlwifi/fw/api/tx.h

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ enum iwl_mvm_ba_resp_flags { 
 * @reduced_txp: power reduced according to TPC. This is the actual value and

 *	not a copy from the LQ command. Thus, if not the first rate was used

 *	for Tx-ing then this value will be set to 0 by FW.

 * @initial_rate: TLC rate info, initial rate index, TLC table color

 * @tlc_rate_info: TLC rate info, initial rate index, TLC table color

 * @retry_cnt: retry count

 * @query_byte_cnt: SCD query byte count

 * @query_frame_cnt: SCD query frame count
@@ -730,7 +730,7 @@ struct iwl_mvm_compressed_ba_notif { 
	__le32 flags;

	u8 sta_id;

	u8 reduced_txp;

	u8 initial_rate;

	u8 tlc_rate_info;

	u8 retry_cnt;

	__le32 query_byte_cnt;

	__le16 query_frame_cnt;

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

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ struct iwl_cfg { 
	u8 max_vht_ampdu_exponent;

	u8 ucode_api_max;

	u8 ucode_api_min;

	u32 min_umac_error_event_table;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE