From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932584AbXKPSfl (ORCPT ); Fri, 16 Nov 2007 13:35:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759063AbXKPSe5 (ORCPT ); Fri, 16 Nov 2007 13:34:57 -0500 Received: from wr-out-0506.google.com ([64.233.184.235]:19033 "EHLO wr-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757604AbXKPSey convert rfc822-to-8bit (ORCPT ); Fri, 16 Nov 2007 13:34:54 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:from:to:subject:date:user-agent:cc:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=JBNdmjaZaeC1yD+aAgxtw+neh0h2gj5zdf3K3SX1Yluc3pftkda6FqC3cSSYNDtL1N8awtVa53vDAZUVBbRM5xQxZKZ0fywCeu4VeVVc5Qcf2nm5OsVBJZNkKb69upWe2DOVvJPhAvBZnzPz8EyBHEAEzWJk6hRwIHcGBZtgof4= From: Miguel =?utf-8?q?Bot=C3=B3n?= To: Linux Kernel Mailing List Subject: [PATCH 2/2] iwlwifi: add power management support Date: Fri, 16 Nov 2007 19:32:22 +0100 User-Agent: KMail/1.9.7 Cc: linux-wireless@vger.kernel.org, linville@tuxdriver.com, yi.zhu@intel.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-Id: <200711161932.22807.mboton.lkml@gmail.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch adds power management support in iwl3945 and iwl4965 drivers. Signed-off-by: Miguel Botón diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 9baf8de..5c7b422 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -6951,6 +7187,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co struct iwl3945_priv *priv = hw->priv; const struct iwl3945_channel_info *ch_info; unsigned long flags; + int power_mode; mutex_lock(&priv->mutex); IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel); @@ -7001,6 +7238,21 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co } #endif + if (conf->power_management_enable) + power_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED; + else + power_mode = IWL_POWER_AC; + + if (priv->power_mode != power_mode) { + int rc; + + rc = iwl3945_send_power_mode(priv, power_mode); + if (rc) + IWL_DEBUG_MAC80211("failed setting power mode.\n"); + else + priv->power_mode = power_mode; + } + iwl3945_radio_kill_sw(priv, !conf->radio_enabled); if (!conf->radio_enabled) { diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index df011ea..8d303c5 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -7352,6 +7352,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co struct iwl4965_priv *priv = hw->priv; const struct iwl4965_channel_info *ch_info; unsigned long flags; + int power_mode; mutex_lock(&priv->mutex); IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel); @@ -7414,6 +7415,21 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co } #endif + if (conf->power_management_enable) + power_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED; + else + power_mode = IWL_POWER_AC; + + if (priv->power_mode != power_mode) { + int rc; + + rc = iwl4965_send_power_mode(priv, power_mode); + if (rc) + IWL_DEBUG_MAC80211("failed setting power mode.\n"); + else + priv->power_mode = power_mode; + } + iwl4965_radio_kill_sw(priv, !conf->radio_enabled); if (!conf->radio_enabled) { -- Miguel Botón