diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-07 18:59:57 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-07 18:59:57 (GMT) |
| commit | 1b2388d03f871faec084666fe71acc770fad5160 (patch) | |
| tree | c283fa26cb05404de8ba43b57f573e955568d748 /drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | |
| parent | 701a9e619347ac06d59481db14bbc4df99763270 (diff) | |
| parent | dc271ee0d04d12d6bfabacbec803289a7072fbd9 (diff) | |
| download | linux-1b2388d03f871faec084666fe71acc770fad5160.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
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 8b53027..725ba49 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); |