[PATCH 3.2 014/102] Revert "iwlwifi: dvm: don't enable CTS to self"
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: Emmanuel Grumbach commit f47f46d7b09cf1d09e4b44b6cc4dd7d68a08028c upstream. This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd. This commit caused packet loss. Signed-off-by: Emmanuel Grumbach [bwh: Backported to 3.2: - Adjust filename - Condition for RXON_FLG_SELF_CTS_EN in iwlagn_commit_rxon() was different] Signed-off-by: Ben Hutchings --- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 - 1 file changed, 13 deletions(-) --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -440,6 +440,14 @@ int iwlagn_commit_rxon(struct iwl_priv * /* always get timestamp with Rx frame */ ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK; + /* +* force CTS-to-self frames protection if RTS-CTS is not preferred +* one aggregation protection method +*/ + if (!(priv->cfg->ht_params && + priv->cfg->ht_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; @@ -872,6 +880,11 @@ void iwlagn_bss_info_changed(struct ieee 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 || -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3.2 014/102] Revert iwlwifi: dvm: don't enable CTS to self
3.2.64-rc1 review patch. If anyone has any objections, please let me know. -- From: Emmanuel Grumbach emmanuel.grumb...@intel.com commit f47f46d7b09cf1d09e4b44b6cc4dd7d68a08028c upstream. This reverts commit 43d826ca5979927131685cc2092c7ce862cb91cd. This commit caused packet loss. Signed-off-by: Emmanuel Grumbach emmanuel.grumb...@intel.com [bwh: Backported to 3.2: - Adjust filename - Condition for RXON_FLG_SELF_CTS_EN in iwlagn_commit_rxon() was different] Signed-off-by: Ben Hutchings b...@decadent.org.uk --- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 - 1 file changed, 13 deletions(-) --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -440,6 +440,14 @@ int iwlagn_commit_rxon(struct iwl_priv * /* always get timestamp with Rx frame */ ctx-staging.flags |= RXON_FLG_TSF2HOST_MSK; + /* +* force CTS-to-self frames protection if RTS-CTS is not preferred +* one aggregation protection method +*/ + if (!(priv-cfg-ht_params + priv-cfg-ht_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; @@ -872,6 +880,11 @@ void iwlagn_bss_info_changed(struct ieee 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 || -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
