From patchwork Tue Dec 17 20:44:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3365591 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 A2B1FC0D4A for ; Tue, 17 Dec 2013 20:46:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D8715203B1 for ; Tue, 17 Dec 2013 20:46:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F397B2017A for ; Tue, 17 Dec 2013 20:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872Ab3LQUpF (ORCPT ); Tue, 17 Dec 2013 15:45:05 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:39714 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753906Ab3LQUpD (ORCPT ); Tue, 17 Dec 2013 15:45:03 -0500 Received: by mail-ee0-f50.google.com with SMTP id c41so3192279eek.9 for ; Tue, 17 Dec 2013 12:45:01 -0800 (PST) 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=f7nU6yWQSwxSQEJR61R4M+pw8K3cLzyKVU1UDJ6nNoU=; b=IREWAX88pgD5UqhQiWqqFVo4tTbYp23WKvR/VzHITIqKEKG8WQtCsBArffw3BpVYze 4nfk6u7RfHSkAPomKw4VGW4jO3Hjku9gojXbpaYZsorSAIvaWfSlsE75sMkbRyCqIB2s s256jQA2agXg4QkKErgUR+zN2pDWWusp2/Q1fH16ZK+caeWqSvBBQ5vTqxylJ3SNvODo MO6dsfRx6opgY+aYZkMxSuRD4DI2KDTn671bRkF5lsGteEJ8Cg0w+uKinW3X6iZLYm0l jeCuZXMLpNfhglRt0py4WEDoIEPJaZjEWbSSk2AvXVpTr7Sco3pvrcXZwvIsefuD6/gj HgxA== X-Received: by 10.15.56.7 with SMTP id x7mr24773932eew.43.1387313101736; Tue, 17 Dec 2013 12:45:01 -0800 (PST) Received: from localhost.localdomain (93-173-242-52.bb.netvision.net.il. [93.173.242.52]) by mx.google.com with ESMTPSA id 4sm56278497eed.14.2013.12.17.12.45.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 12:45:01 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 12/36] iwlwifi: mvm: move iwl_mvm_set_tx_power to PHY area Date: Tue, 17 Dec 2013 22:44:15 +0200 Message-Id: <1387313079-28123-12-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52B0B72A.5070704@gmail.com> References: <52B0B72A.5070704@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.3 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 This is more related to phy contexts than to mac context. Move this function to there. Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index b42ce2c..9a27f57 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -516,6 +516,20 @@ static struct iwl_mvm_phy_ctxt *iwl_mvm_get_free_phy_ctxt(struct iwl_mvm *mvm) return NULL; } +static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + s8 tx_power) +{ + /* FW is in charge of regulatory enforcement */ + struct iwl_reduce_tx_power_cmd reduce_txpwr_cmd = { + .mac_context_id = iwl_mvm_vif_from_mac80211(vif)->id, + .pwr_restriction = cpu_to_le16(tx_power), + }; + + return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, CMD_SYNC, + sizeof(reduce_txpwr_cmd), + &reduce_txpwr_cmd); +} + static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { @@ -736,20 +750,6 @@ out_release: mutex_unlock(&mvm->mutex); } -static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif, - s8 tx_power) -{ - /* FW is in charge of regulatory enforcement */ - struct iwl_reduce_tx_power_cmd reduce_txpwr_cmd = { - .mac_context_id = iwl_mvm_vif_from_mac80211(vif)->id, - .pwr_restriction = cpu_to_le16(tx_power), - }; - - return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, CMD_SYNC, - sizeof(reduce_txpwr_cmd), - &reduce_txpwr_cmd); -} - static int iwl_mvm_mac_config(struct ieee80211_hw *hw, u32 changed) { return 0;