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

Commit 7e64e5e6 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-10-05' of... 

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

* more clean-ups towards multiple RX queues;
* some rate scaling fixes and improvements;
* some time-of-flight fixes;
* other generic improvements and clean-ups;
parents f79683de 0316d30e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5541,7 +5541,7 @@ F: drivers/net/wireless/iwlegacy/ 
INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

M:	Intel Linux Wireless <linuxwifi@intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

drivers/net/wireless/iwlwifi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE 
config IWLWIFI_DEVICE_TRACING

	bool "iwlwifi device access tracing"

	depends on EVENT_TRACING

	default y

	help

	  Say Y here to trace all commands, including TX frames and IO

	  accesses, sent to the device. If you say yes, iwlwifi will

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

+0 −7
Original line number Diff line number Diff line
@@ -73,11 +73,9 @@ 


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

#define IWL7260_UCODE_API_OK	13

#define IWL3165_UCODE_API_OK	13



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	13

#define IWL3165_UCODE_API_MIN	13



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d
@@ -269,11 +267,6 @@ const struct iwl_cfg iwl3165_2ac_cfg = { 
	.name = "Intel(R) Dual Band Wireless AC 3165",

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	/* sparse doens't like the re-assignment but it is safe */

#ifndef __CHECKER__

	.ucode_api_ok = IWL3165_UCODE_API_OK,

	.ucode_api_min = IWL3165_UCODE_API_MIN,

#endif

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,

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

+6 −6
Original line number Diff line number Diff line
@@ -223,13 +223,13 @@ struct iwl_tt_tx_backoff { 
 * @support_tx_backoff: Support tx-backoff?

 */

struct iwl_tt_params {

	s32 ct_kill_entry;

	s32 ct_kill_exit;

	u32 ct_kill_entry;

	u32 ct_kill_exit;

	u32 ct_kill_duration;

	s32 dynamic_smps_entry;

	s32 dynamic_smps_exit;

	s32 tx_protection_entry;

	s32 tx_protection_exit;

	u32 dynamic_smps_entry;

	u32 dynamic_smps_exit;

	u32 tx_protection_entry;

	u32 tx_protection_exit;

	struct iwl_tt_tx_backoff tx_backoff[TT_TX_BACKOFF_SIZE];

	bool support_ct_kill;

	bool support_dynamic_smps;

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

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data, 
	u32 api_flags = le32_to_cpu(ucode_api->api_flags);

	int i;



	if (api_index >= IWL_API_MAX_BITS / 32) {

	if (api_index >= DIV_ROUND_UP(NUM_IWL_UCODE_TLV_API, 32)) {

		IWL_ERR(drv, "api_index larger than supported by driver\n");

		/* don't return an error so we can load FW that has more bits */

		return 0;
@@ -472,7 +472,7 @@ static int iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data, 
	u32 api_flags = le32_to_cpu(ucode_capa->api_capa);

	int i;



	if (api_index >= IWL_CAPABILITIES_MAX_BITS / 32) {

	if (api_index >= DIV_ROUND_UP(NUM_IWL_UCODE_TLV_CAPA, 32)) {

		IWL_ERR(drv, "api_index larger than supported by driver\n");

		/* don't return an error so we can load FW that has more bits */

		return 0;