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

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -1068,13 +1068,6 @@ int iwlagn_commit_rxon(struct iwl_priv priv, struct iwl_rxon_context ctx)
		/* recalculate basic rates */
		iwl_calc_basic_rates(priv, ctx);

		/*
		* force CTS-to-self frames protection if RTS-CTS is not preferred
		* one aggregation protection method
		*/
		if (!priv->hw_params.use_rts_for_aggregation)
		ctx->staging.flags \|= RXON_FLG_SELF_CTS_EN;

		if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) \|\|
		!(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
		ctx->staging.flags \|= RXON_FLG_SHORT_SLOT_MSK;
		@@ -1480,11 +1473,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
		else
		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;

		if (bss_conf->use_cts_prot)
		ctx->staging.flags \|= RXON_FLG_SELF_CTS_EN;
		else
		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;

		memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);

		if (vif->type == NL80211_IFTYPE_AP \|\|

+2 −3

Original line number	Diff line number	Diff line
		@@ -667,10 +667,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
		if (vif->bss_conf.qos)
		cmd->qos_flags \|= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);

		if (vif->bss_conf.use_cts_prot) {
		if (vif->bss_conf.use_cts_prot)
		cmd->protection_flags \|= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);
		cmd->protection_flags \|= cpu_to_le32(MAC_PROT_FLG_SELF_CTS_EN);
		}

		IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",
		vif->bss_conf.use_cts_prot,
		vif->bss_conf.ht_operation_mode);

+6 −6

Original line number	Diff line number	Diff line
		@@ -1166,8 +1166,12 @@ static void iwl_mvm_bcast_filter_iterator(void _data, u8 mac,

		bcast_mac = &cmd->macs[mvmvif->id];

		/* enable filtering only for associated stations */
		if (vif->type != NL80211_IFTYPE_STATION \|\| !vif->bss_conf.assoc)
		/*
		* enable filtering only for associated stations, but not for P2P
		* Clients
		*/
		if (vif->type != NL80211_IFTYPE_STATION \|\| vif->p2p \|\|
		!vif->bss_conf.assoc)
		return;

		bcast_mac->default_discard = 1;
		@@ -1244,10 +1248,6 @@ static int iwl_mvm_configure_bcast_filter(struct iwl_mvm *mvm,
		if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BCAST_FILTERING))
		return 0;

		/* bcast filtering isn't supported for P2P client */
		if (vif->p2p)
		return 0;

		if (!iwl_mvm_bcast_filter_build_cmd(mvm, &cmd))
		return 0;