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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents cabae811 83f7a85f

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

+3 −3
Original line number Diff line number Diff line
@@ -611,14 +611,14 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
		bt_cmd->flags |= cpu_to_le32(BT_COEX_SYNC2SCO);



	if (IWL_MVM_BT_COEX_CORUNNING) {

		bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_CORUN_LUT_20 |

		bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_CORUN_LUT_20 |

						     BT_VALID_CORUN_LUT_40);

		bt_cmd->flags |= cpu_to_le32(BT_COEX_CORUNNING);

	}



	if (IWL_MVM_BT_COEX_MPLUT) {

		bt_cmd->flags |= cpu_to_le32(BT_COEX_MPLUT);

		bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_MULTI_PRIO_LUT);

		bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_MULTI_PRIO_LUT);

	}



	if (mvm->cfg->bt_shared_single_ant)

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+4 −4
Original line number Diff line number Diff line
@@ -183,9 +183,9 @@ enum iwl_scan_type { 
 *	this number of packets were received (typically 1)

 * @passive2active: is auto switching from passive to active during scan allowed

 * @rxchain_sel_flags: RXON_RX_CHAIN_*

 * @max_out_time: in usecs, max out of serving channel time

 * @max_out_time: in TUs, max out of serving channel time

 * @suspend_time: how long to pause scan when returning to service channel:

 *	bits 0-19: beacon interal in usecs (suspend before executing)

 *	bits 0-19: beacon interal in TUs (suspend before executing)

 *	bits 20-23: reserved

 *	bits 24-31: number of beacons (suspend between channels)

 * @rxon_flags: RXON_FLG_*
@@ -383,8 +383,8 @@ enum scan_framework_client { 
 * @quiet_plcp_th:	quiet channel num of packets threshold

 * @good_CRC_th:	passive to active promotion threshold

 * @rx_chain:		RXON rx chain.

 * @max_out_time:	max uSec to be out of assoceated channel

 * @suspend_time:	pause scan this long when returning to service channel

 * @max_out_time:	max TUs to be out of assoceated channel

 * @suspend_time:	pause scan this TUs when returning to service channel

 * @flags:		RXON flags

 * @filter_flags:	RXONfilter

 * @tx_cmd:		tx command for active scan; for 2GHz and for 5GHz.

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+5 −0
Original line number Diff line number Diff line
@@ -1807,6 +1807,11 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw, 


	mutex_lock(&mvm->mutex);



	if (iwl_mvm_is_associated(mvm)) {

		ret = -EBUSY;

		goto out;

	}



	switch (mvm->scan_status) {

	case IWL_MVM_SCAN_OS:

		IWL_DEBUG_SCAN(mvm, "Stopping previous scan for sched_scan\n");

drivers/net/wireless/iwlwifi/mvm/mvm.h

+3 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,9 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif) 
	return mvmvif->low_latency;

}



/* Assoc status */

bool iwl_mvm_is_associated(struct iwl_mvm *mvm);



/* Thermal management and CT-kill */

void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);

void iwl_mvm_tt_handler(struct iwl_mvm *mvm);

drivers/net/wireless/iwlwifi/mvm/rs.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static void rs_tx_status(void *mvm_r, struct ieee80211_supported_band *sband, 
		return;

	}



#ifdef CPTCFG_MAC80211_DEBUGFS

#ifdef CONFIG_MAC80211_DEBUGFS

	/* Disable last tx check if we are debugging with fixed rate */

	if (lq_sta->dbg_fixed_rate) {

		IWL_DEBUG_RATE(mvm, "Fixed rate. avoid rate scaling\n");