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

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

[Jim Rees]

Without this revert, my Thinkpad x220 with iwlwifi Ultimate-N 6300 AGN gets
35% packet drop rate.

This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd.

Signed-off-by: Jim Rees <rees@umich.edu>
---
 drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 6dc5dd3..ed50de6 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1068,6 +1068,13 @@ 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;
@@ -1473,6 +1480,11 @@ 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.1.0

Re: [PATCH] Revert "iwlwifi: dvm: don't enable CTS to self"

[Emmanuel Grumbach]

On Mon, Sep 1, 2014 at 5:22 AM, Jim Rees <rees@umich.edu> wrote:
> Without this revert, my Thinkpad x220 with iwlwifi Ultimate-N 6300 AGN gets
> 35% packet drop rate.
>
> This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd.
>
> Signed-off-by: Jim Rees <rees@umich.edu>
> ---
>  drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>

Thanks - I already have this in my tree.