diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 10:59:16 +0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 11:01:16 +0400 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |
| parent | 6534e6809e6c9d48114b537afe03bee3fd33bf01 (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| download | linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.tar.xz | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
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 8b5302777632..725ba49576bf 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); |