From 4f8e8527df602c9d932e4be00d86c1d93cfb6b9a Mon Sep 17 00:00:00 2001 From: Dor Shaish Date: Mon, 18 Feb 2013 13:51:36 +0200 Subject: [PATCH] --- yaml --- r: 368451 b: refs/heads/master c: cc7ee2bab3d90b0a09651dcfa2d0c9ec1a115bc8 h: refs/heads/master i: 368449: 3376e8b401117ef8a3048d8c9c215c6051ac740b 368447: 331d5957bc81213b8b52aba03ada4c6820dc7ed4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e724188f0f3b..bc453b260e11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80d8565557747854d6ff7fc0a756cc71a9fa2372 +refs/heads/master: cc7ee2bab3d90b0a09651dcfa2d0c9ec1a115bc8 diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index 147e925d6474..3a136c1d3a5d 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c @@ -553,9 +553,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); + /* Don't use cts to self as the fw doesn't support it currently. */ if (vif->bss_conf.use_cts_prot) - cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT | - MAC_PROT_FLG_SELF_CTS_EN); + cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT); /* * I think that we should enable these 2 flags regardless the HT PROT