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

Commit 43d826ca authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: dvm: don't enable CTS to self 



We should always prefer to use full RTS protection. Using
CTS to self gives a meaningless improvement, but this flow
is much harder for the firmware which is likely to have
issues with it.

CC: <stable@vger.kernel.org>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e48393e8

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 ||