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/mvm/mac-ctxt.c | |
| parent | c47af22ad630e03053f3eeefd19bd8274989ffbb (diff) | |
| parent | dc271ee0d04d12d6bfabacbec803289a7072fbd9 (diff) | |
| download | op-kernel-dev-44621b82aa7ce90b7d4a767be097a0a43da1d1e8.zip op-kernel-dev-44621b82aa7ce90b7d4a767be097a0a43da1d1e8.tar.gz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index aad3621..549817d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c @@ -667,10 +667,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm, if (vif->bss_conf.qos) cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA); - if (vif->bss_conf.use_cts_prot) { + if (vif->bss_conf.use_cts_prot) cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT); - cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_SELF_CTS_EN); - } + IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n", vif->bss_conf.use_cts_prot, vif->bss_conf.ht_operation_mode); |
