Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (235c0dc5) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,11 @@ static int iwl_init_channel_map(struct device dev, const struct iwl_cfg cfg,

		for (ch_idx = 0; ch_idx < IWL_NUM_CHANNELS; ch_idx++) {
		ch_flags = __le16_to_cpup(nvm_ch_flags + ch_idx);

		if (ch_idx >= NUM_2GHZ_CHANNELS &&
		!data->sku_cap_band_52GHz_enable)
		ch_flags &= ~NVM_CHANNEL_VALID;

		if (!(ch_flags & NVM_CHANNEL_VALID)) {
		IWL_DEBUG_EEPROM(dev,
		"Ch. %d Flags %x [%sGHz] - No traffic\n",

+3 −1

Original line number	Diff line number	Diff line
		@@ -504,6 +504,7 @@ struct iwl_scan_offload_profile {
		* @match_notify: clients waiting for match found notification
		* @pass_match: clients waiting for the results
		* @active_clients: active clients bitmap - enum scan_framework_client
		* @any_beacon_notify: clients waiting for match notification without match
		*/
		struct iwl_scan_offload_profile_cfg {
		struct iwl_scan_offload_profile profiles[IWL_SCAN_MAX_PROFILES];
		@@ -512,7 +513,8 @@ struct iwl_scan_offload_profile_cfg {
		u8 match_notify;
		u8 pass_match;
		u8 active_clients;
		u8 reserved[3];
		u8 any_beacon_notify;
		u8 reserved[2];
		} __packed;

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		else
		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

		if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) {
		if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) {
		hw->wiphy->flags \|= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
		hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX;
		hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES;

+4 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,8 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,

		iwl_mvm_scan_fill_ssids(cmd, req, basic_ssid ? 1 : 0);

		cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL);
		cmd->tx_cmd.tx_flags = cpu_to_le32(TX_CMD_FLG_SEQ_CTL \|
		TX_CMD_FLG_BT_DIS);
		cmd->tx_cmd.sta_id = mvm->aux_sta.sta_id;
		cmd->tx_cmd.life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);
		cmd->tx_cmd.rate_n_flags =
		@@ -807,6 +808,8 @@ int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
		profile_cfg->active_clients = SCAN_CLIENT_SCHED_SCAN;
		profile_cfg->pass_match = SCAN_CLIENT_SCHED_SCAN;
		profile_cfg->match_notify = SCAN_CLIENT_SCHED_SCAN;
		if (!req->n_match_sets \|\| !req->match_sets[0].ssid.ssid_len)
		profile_cfg->any_beacon_notify = SCAN_CLIENT_SCHED_SCAN;

		for (i = 0; i < req->n_match_sets; i++) {
		profile = &profile_cfg->profiles[i];

+1 −1

Original line number	Diff line number	Diff line
		@@ -652,7 +652,7 @@ int iwl_mvm_send_bcast_sta(struct iwl_mvm mvm, struct ieee80211_vif vif,
		{
		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
		static const u8 _baddr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
		static const u8 *baddr = _baddr;
		const u8 *baddr = _baddr;

		lockdep_assert_held(&mvm->mutex);