diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-06 11:15:23 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-06 11:15:23 +0300 |
| commit | 44621b82aa7ce90b7d4a767be097a0a43da1d1e8 (patch) | |
| tree | 2153b096952476812e4f5af8c4f9f9fbce1789de /drivers/net/wireless/iwlwifi/dvm | |
| parent | c47af22ad630e03053f3eeefd19bd8274989ffbb (diff) | |
| parent | dc271ee0d04d12d6bfabacbec803289a7072fbd9 (diff) | |
| download | blackbird-op-linux-44621b82aa7ce90b7d4a767be097a0a43da1d1e8.tar.gz blackbird-op-linux-44621b82aa7ce90b7d4a767be097a0a43da1d1e8.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c index ed50de6362ed..6dc5dd3ced44 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c @@ -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 || |
