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

Commit 8cd4cbf2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-02-03' of... 

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

* Add support for beamforming
* Enable stuck queue detection for iwlmvm
* A few fixes for EBS scan
* Fixes for various failure paths
* Improvements for TDLS Offchannel
parents 297540f6 b9a641d9

drivers/net/wireless/iwlwifi/dvm/main.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -1228,11 +1228,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
	trans_cfg.no_reclaim_cmds = no_reclaim_cmds;

	trans_cfg.no_reclaim_cmds = no_reclaim_cmds;

	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);

	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);

	trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;

	trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;

	if (!iwlwifi_mod_params.wd_disable)

	trans_cfg.cmd_q_wdg_timeout = IWL_WATCHDOG_DISABLED;

		trans_cfg.queue_watchdog_timeout =



			priv->cfg->base_params->wd_timeout;

	else

		trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;

	trans_cfg.command_names = iwl_dvm_cmd_strings;

	trans_cfg.command_names = iwl_dvm_cmd_strings;

	trans_cfg.cmd_fifo = IWLAGN_CMD_FIFO_NUM;

	trans_cfg.cmd_fifo = IWLAGN_CMD_FIFO_NUM;

drivers/net/wireless/iwlwifi/dvm/tx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -715,7 +715,7 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif, 
	fifo = ctx->ac_to_fifo[tid_to_ac[tid]];

	fifo = ctx->ac_to_fifo[tid_to_ac[tid]];





	iwl_trans_txq_enable(priv->trans, q, fifo, sta_priv->sta_id, tid,

	iwl_trans_txq_enable(priv->trans, q, fifo, sta_priv->sta_id, tid,

			     buf_size, ssn);

			     buf_size, ssn, 0);





	/*

	/*

	 * If the limit is 0, then it wasn't initialised yet,

	 * If the limit is 0, then it wasn't initialised yet,

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -267,7 +267,7 @@ static int iwl_alive_notify(struct iwl_priv *priv) 
	for (i = 0; i < n_queues; i++)

	for (i = 0; i < n_queues; i++)

		if (queue_to_txf[i] != IWL_TX_FIFO_UNUSED)

		if (queue_to_txf[i] != IWL_TX_FIFO_UNUSED)

			iwl_trans_ac_txq_enable(priv->trans, i,

			iwl_trans_ac_txq_enable(priv->trans, i,

						queue_to_txf[i]);

						queue_to_txf[i], 0);





	priv->passive_no_rx = false;

	priv->passive_no_rx = false;

	priv->transport_queue_stop = 0;

	priv->transport_queue_stop = 0;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ enum iwl_led_mode { 




/* TX queue watchdog timeouts in mSecs */

/* TX queue watchdog timeouts in mSecs */

#define IWL_WATCHDOG_DISABLED	0

#define IWL_WATCHDOG_DISABLED	0

#define IWL_DEF_WD_TIMEOUT	2000

#define IWL_DEF_WD_TIMEOUT	2500

#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_MAX_WD_TIMEOUT	120000

#define IWL_MAX_WD_TIMEOUT	120000

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -1367,7 +1367,6 @@ struct iwl_mod_params iwlwifi_mod_params = { 
	.restart_fw = true,

	.restart_fw = true,

	.bt_coex_active = true,

	.bt_coex_active = true,

	.power_level = IWL_POWER_INDEX_1,

	.power_level = IWL_POWER_INDEX_1,

	.wd_disable = true,

	.d0i3_disable = true,

	.d0i3_disable = true,

#ifndef CONFIG_IWLWIFI_UAPSD

#ifndef CONFIG_IWLWIFI_UAPSD

	.uapsd_disable = true,

	.uapsd_disable = true,
@@ -1478,10 +1477,6 @@ module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling, 
MODULE_PARM_DESC(antenna_coupling,

MODULE_PARM_DESC(antenna_coupling,

		 "specify antenna coupling in dB (default: 0 dB)");

		 "specify antenna coupling in dB (default: 0 dB)");





module_param_named(wd_disable, iwlwifi_mod_params.wd_disable, int, S_IRUGO);

MODULE_PARM_DESC(wd_disable,

		"Disable stuck queue watchdog timer 0=system default, 1=disable (default: 1)");



module_param_named(nvm_file, iwlwifi_mod_params.nvm_file, charp, S_IRUGO);

module_param_named(nvm_file, iwlwifi_mod_params.nvm_file, charp, S_IRUGO);

MODULE_PARM_DESC(nvm_file, "NVM file name");

MODULE_PARM_DESC(nvm_file, "NVM file name");