Return-path: Received: from mga14.intel.com ([143.182.124.37]:1264 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750939Ab3FXNTm (ORCPT ); Mon, 24 Jun 2013 09:19:42 -0400 From: Emmanuel Grumbach To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, linux-wireless@vger.kernel.org, Dor Shaish , Johannes Berg Subject: [PATCH 3.9 2/4] iwlwifi: mvm: don't use cts to self Date: Mon, 24 Jun 2013 16:19:03 +0300 Message-Id: <1372079945-7445-2-git-send-email-emmanuel.grumbach@intel.com> (sfid-20130624_152233_732483_0DB34676) In-Reply-To: <1372079945-7445-1-git-send-email-emmanuel.grumbach@intel.com> References: <1372079945-7445-1-git-send-email-emmanuel.grumbach@intel.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Dor Shaish commit cc7ee2bab3d90b0a09651dcfa2d0c9ec1a115bc8 upstream. The current fw doesn't currently support cts to self. There is a bug in the fw that prevents us from using cts to self. Use full protection (including RTS) for now. Signed-off-by: Dor Shaish Signed-off-by: Johannes Berg --- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c index bf76b17..864cd6d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +++ b/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 -- 1.7.10.4