From patchwork Thu May 22 07:23:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 4220861 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E9642BEEAB for ; Thu, 22 May 2014 07:25:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DAAB2021A for ; Thu, 22 May 2014 07:25:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D769201ED for ; Thu, 22 May 2014 07:25:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754004AbaEVHYU (ORCPT ); Thu, 22 May 2014 03:24:20 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:39956 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751187AbaEVHYQ (ORCPT ); Thu, 22 May 2014 03:24:16 -0400 Received: by mail-wi0-f177.google.com with SMTP id f8so3839659wiw.16 for ; Thu, 22 May 2014 00:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3j7Y/FjOPO1L/BFlsH+ml23LIGhNXzsHfJDM2+8FAvM=; b=VFAYKM22pIK04Fx2sdE3pHqcHYbmt8K+uCcAU+3AnIPBQc1dm/I1cr1jFVg0uOmr/3 b2ho1lXZfJAD7LqbSP5T+7OuxhH6/AOlymrZQ7o+LfjhqsJQpFRg+Et5uYWk9YBD0dur K8YUdGbdJushYUCiENiMj5IgDsHsLJEdO70lqqbpfC7CZHDpGr7rVhnXZ0UaETgm/3SK 0VpJsY/HoGhGzT8dSphsLO9xEsl90blHGvlHqpItlOpxgjohUR65vS4qreTFuCjX727+ UCUSmwxDk6NZUDoj2kcMxp3GswOE5m6omSVLjG5o3uq8QG1VLz3YxCeQ+lte+V4pzB1j c29Q== X-Received: by 10.180.8.40 with SMTP id o8mr14693722wia.25.1400743455264; Thu, 22 May 2014 00:24:15 -0700 (PDT) Received: from localhost.localdomain ([109.186.0.219]) by mx.google.com with ESMTPSA id en6sm6426417wib.11.2014.05.22.00.24.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 00:24:14 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 08/11] iwlwifi: mvm: disable reduced Tx power when not applicable Date: Thu, 22 May 2014 10:23:52 +0300 Message-Id: <1400743435-702-8-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <537DA58C.5050003@gmail.com> References: <537DA58C.5050003@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emmanuel Grumbach I forgot to disable the reduced Tx power in a few paths. Reviewed-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/coex.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/iwlwifi/mvm/coex.c index cbad3ef..e35f5a0 100644 --- a/drivers/net/wireless/iwlwifi/mvm/coex.c +++ b/drivers/net/wireless/iwlwifi/mvm/coex.c @@ -831,8 +831,11 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, iwl_mvm_update_smps(mvm, vif, IWL_MVM_SMPS_REQ_BT_COEX, smps_mode); data->reduced_tx_power = false; - if (vif->type == NL80211_IFTYPE_STATION) + if (vif->type == NL80211_IFTYPE_STATION) { + iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, + false); iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0); + } return; } @@ -905,6 +908,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, mvm->cfg->bt_shared_single_ant || !vif->bss_conf.assoc || !data->notif->bt_status) { data->reduced_tx_power = false; + iwl_mvm_bt_coex_reduced_txp(mvm, mvmvif->ap_sta_id, false); iwl_mvm_bt_coex_enable_rssi_event(mvm, vif, false, 0); return; }