From: Zhu Yi <yi.zhu@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [PATCH 23/29] iwlwifi: move iwl4965_rf_kill_ct_config to iwl-core.c
Date: Thu, 12 Jun 2008 09:47:13 +0800 [thread overview]
Message-ID: <1213235239-2954-24-git-send-email-yi.zhu@intel.com> (raw)
In-Reply-To: <1213235239-2954-23-git-send-email-yi.zhu@intel.com>
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This patch moves iwl4965_rf_kill_ct_config to iwl-core.c.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-4965.c | 24 ------------------------
drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-core.c | 23 +++++++++++++++++++++++
drivers/net/wireless/iwlwifi/iwl-core.h | 1 +
drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +-
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 87648d0..aeb29b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -556,30 +556,6 @@ out:
#define REG_RECALIB_PERIOD (60)
-void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)
-{
- struct iwl4965_ct_kill_config cmd;
- unsigned long flags;
- int ret = 0;
-
- spin_lock_irqsave(&priv->lock, flags);
- iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
- CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
- spin_unlock_irqrestore(&priv->lock, flags);
-
- cmd.critical_temperature_R =
- cpu_to_le32(priv->hw_params.ct_kill_threshold);
-
- ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,
- sizeof(cmd), &cmd);
- if (ret)
- IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n");
- else
- IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, "
- "critical temperature is %d\n",
- cmd.critical_temperature_R);
-}
-
/* Reset differential Rx gains in NIC to prepare for chain noise calibration.
* Called after every association, but this runs only once!
* ... once chain noise is calibrated the first time, it's good forever. */
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 6613d32..920dfc1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2078,7 +2078,7 @@ struct iwl4965_card_state_notif {
#define RF_CARD_DISABLED 0x04
#define RXON_CARD_DISABLED 0x10
-struct iwl4965_ct_kill_config {
+struct iwl_ct_kill_config {
__le32 reserved;
__le32 critical_temperature_M;
__le32 critical_temperature_R;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 9794904..8096463 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1326,4 +1326,27 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv)
}
EXPORT_SYMBOL(iwl_dump_nic_event_log);
+void iwl_rf_kill_ct_config(struct iwl_priv *priv)
+{
+ struct iwl_ct_kill_config cmd;
+ unsigned long flags;
+ int ret = 0;
+
+ spin_lock_irqsave(&priv->lock, flags);
+ iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,
+ CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ cmd.critical_temperature_R =
+ cpu_to_le32(priv->hw_params.ct_kill_threshold);
+ ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,
+ sizeof(cmd), &cmd);
+ if (ret)
+ IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n");
+ else
+ IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, "
+ "critical temperature is %d\n",
+ cmd.critical_temperature_R);
+}
+EXPORT_SYMBOL(iwl_rf_kill_ct_config);
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 8d9fde6..59dd342 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -371,6 +371,7 @@ int iwlcore_low_level_notify(struct iwl_priv *priv,
enum iwlcore_card_notify notify);
extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);
extern int iwl_verify_ucode(struct iwl_priv *priv);
+extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);
int iwl_send_lq_cmd(struct iwl_priv *priv,
struct iwl_link_quality_cmd *lq, u8 flags);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 2073ba6..3717f99 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2295,7 +2295,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
iwl4965_commit_rxon(priv);
/* At this point, the NIC is initialized and operational */
- iwl4965_rf_kill_ct_config(priv);
+ iwl_rf_kill_ct_config(priv);
iwl_leds_register(priv);
--
1.5.3.6
next prev parent reply other threads:[~2008-06-12 1:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-12 1:46 [PATCH 00/29] iwlwifi driver 06/12 updates Zhu Yi
2008-06-12 1:46 ` [PATCH 01/29] iwlwifi: removing IWL4965_HT config Zhu Yi
2008-06-12 1:46 ` [PATCH 02/29] iwlwifi: removes the RUN_TIME_CALIB ifdef Zhu Yi
2008-06-12 1:46 ` [PATCH 03/29] iwlwifi: clean up in setup/cancel deferred work Zhu Yi
2008-06-12 1:46 ` [PATCH 04/29] iwlwifi: add possibility to disable tx_power calibration Zhu Yi
2008-06-12 1:46 ` [PATCH 05/29] iwlwifi: map sw and hw ampdu queues Zhu Yi
2008-06-12 1:46 ` [PATCH 06/29] iwlwifi: add TX aggregation code for 5000 HW Zhu Yi
2008-06-12 1:46 ` [PATCH 07/29] iwlwifi: use ieee80211_conf to examine rate capabilities Zhu Yi
2008-06-12 1:46 ` [PATCH 08/29] iwlwifi: fix allow iwlwifi to aggregate according to tid load Zhu Yi
2008-06-12 1:46 ` [PATCH 09/29] iwlwifi: remove unused flag Zhu Yi
2008-06-12 1:47 ` [PATCH 10/29] iwlwifi: remove redundant flags regarding to FAT channel Zhu Yi
2008-06-12 1:47 ` [PATCH 11/29] iwlwifi: fix bug when moving from 11gn to 11a or 11an to 11g Zhu Yi
2008-06-12 1:47 ` [PATCH 12/29] iwlwifi: format log prints for easier parsing Zhu Yi
2008-06-12 1:47 ` [PATCH 13/29] iwlwifi: fix resume SW RF-kill Zhu Yi
2008-06-12 1:47 ` [PATCH 14/29] iwlwifi: fix resart flow after fw error Zhu Yi
2008-06-12 1:47 ` [PATCH 15/29] iwlwifi enabling IBSS (Ad-Hoc) mode Zhu Yi
2008-06-12 1:47 ` [PATCH 16/29] iwlwifi: Fix mode changes (ad-hoc <--> managed) Zhu Yi
2008-06-12 1:47 ` [PATCH 17/29] iwlwifi: refactor tx aggregation response flow Zhu Yi
2008-06-12 1:47 ` [PATCH 18/29] iwlwifi: refactor setting tx power Zhu Yi
2008-06-12 1:47 ` [PATCH 19/29] iwlwifi: add bad length check for WEP keys Zhu Yi
2008-06-12 1:47 ` [PATCH 20/29] iwlwifi: move scan to iwl-scan.c iwlcore Zhu Yi
2008-06-12 1:47 ` [PATCH 21/29] iwlwifi: move rate helpers to iwlcore Zhu Yi
2008-06-12 1:47 ` [PATCH 22/29] iwlwifi: cleans up scanning code Zhu Yi
2008-06-12 1:47 ` Zhu Yi [this message]
2008-06-12 1:47 ` [PATCH 24/29] iwlwifi: retfactor get_temperature functions Zhu Yi
2008-06-12 1:47 ` [PATCH 25/29] iwlwifi: remove dead code iwl4965_calc_db_from_ratio Zhu Yi
2008-06-12 1:47 ` [PATCH 26/29] mac80211 : fix for iwconfig in ad-hoc mode Zhu Yi
2008-06-12 1:47 ` [PATCH 27/29] iwlwifi: fix software rf_kill problem when interface is down Zhu Yi
2008-06-12 1:47 ` [PATCH 28/29] iwlwifi: general code clean up Zhu Yi
2008-06-12 1:47 ` [PATCH 29/29] iwlwifi: remove iwlcore_low_level_notify Zhu Yi
2008-06-12 2:14 ` [PATCH 26/29] mac80211 : fix for iwconfig in ad-hoc mode Dan Williams
2008-06-12 5:15 ` [PATCH 00/29] iwlwifi driver 06/12 updates Harvey Harrison
2008-06-12 5:26 ` Zhu Yi
2008-06-12 14:00 ` John W. Linville
2008-06-13 1:30 ` Zhu Yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1213235239-2954-24-git-send-email-yi.zhu@intel.com \
--to=yi.zhu@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=tomas.winkler@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).