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

Commit f47f46d7 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

Revert "iwlwifi: dvm: don't enable CTS to self" 



This reverts commit 43d826ca.

This commit caused packet loss.

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

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

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

	/* recalculate basic rates */

	iwl_calc_basic_rates(priv, ctx);

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

	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||

	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))

	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
	else

	else

		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;

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

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





	if (vif->type == NL80211_IFTYPE_AP ||

	if (vif->type == NL80211_IFTYPE_AP ||