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

Commit c0465559 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents dce1ebab c92f06a1

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

+4 −5
Original line number Diff line number Diff line
@@ -330,15 +330,14 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, 
	enum iwl_ucode_type old_type;

	static const u8 alive_cmd[] = { REPLY_ALIVE };



	old_type = priv->cur_ucode;

	priv->cur_ucode = ucode_type;

	fw = iwl_get_ucode_image(priv, ucode_type);

	if (WARN_ON(!fw))

		return -EINVAL;



	old_type = priv->cur_ucode;

	priv->cur_ucode = ucode_type;

	priv->ucode_loaded = false;



	if (!fw)

		return -EINVAL;



	iwl_init_notification_wait(&priv->notif_wait, &alive_wait,

				   alive_cmd, ARRAY_SIZE(alive_cmd),

				   iwl_alive_fn, &alive_data);

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

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_P2P			= BIT(3),

	IWL_UCODE_TLV_FLAGS_DW_BC_TABLE		= BIT(4),

	IWL_UCODE_TLV_FLAGS_NEWBT_COEX		= BIT(5),

	IWL_UCODE_TLV_FLAGS_UAPSD		= BIT(6),

	IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT	= BIT(6),

	IWL_UCODE_TLV_FLAGS_SHORT_BL		= BIT(7),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= BIT(9),
@@ -113,6 +113,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_SCHED_SCAN		= BIT(17),

	IWL_UCODE_TLV_FLAGS_STA_KEY_CMD		= BIT(19),

	IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD	= BIT(20),

	IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT	= BIT(24),

};



/* The default calibrate table size if not specified by firmware file */

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

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include "iwl-csr.h"

#include "iwl-debug.h"

#include "iwl-fh.h"

#include "iwl-csr.h"



#define IWL_POLL_INTERVAL 10	/* microseconds */

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

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ struct iwl_trans_config { 
	u8 cmd_queue;

	u8 cmd_fifo;

	const u8 *no_reclaim_cmds;

	int n_no_reclaim_cmds;

	unsigned int n_no_reclaim_cmds;



	bool rx_buf_size_8k;

	bool bc_table_dword;

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+6 −2
Original line number Diff line number Diff line
@@ -505,12 +505,16 @@ static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id, 
	struct iwl_mvm_sta *mvmsta;

	int ret;



	/* This can happen if the station has been removed right now */

	if (sta_id == IWL_MVM_STATION_COUNT)

		return 0;



	sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[sta_id],

					lockdep_is_held(&mvm->mutex));



	/* This can happen if the station has been removed right now */

	if (IS_ERR_OR_NULL(sta))

		return 0;



	mvmsta = (void *)sta->drv_priv;



	/* nothing to do */
@@ -751,7 +755,7 @@ static void iwl_mvm_bt_coex_notif_handle(struct iwl_mvm *mvm) 


		cmd.bt_secondary_ci =

			iwl_ci_mask[chan->def.chan->hw_value][ci_bw_idx];

		cmd.secondary_ch_phy_id = *((u16 *)data.primary->drv_priv);

		cmd.secondary_ch_phy_id = *((u16 *)data.secondary->drv_priv);

	}



	rcu_read_unlock();