aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2009-07-17 12:30:26 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:26 -0400
commit4c423a2b0cc3c85137988962e6ba3f01baef0b4e (patch)
tree904bb75f83809a9889c4621c296bf0ce11186284 /drivers/net/wireless/iwlwifi
parent58dba728b1b727cb3d95a1f76ca4e88a1e628ee1 (diff)
iwlwifi: inform user about rfkill state changes
rfkill state changes are mostly available through debug messages. These are significant enough to always make user aware of so we turn them into warnings. Also insert a missing newline in some rfkill related debug message. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b7ac4ee794c0..44c7f236a7a3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -964,7 +964,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
964 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)) 964 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
965 hw_rf_kill = 1; 965 hw_rf_kill = 1;
966 966
967 IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n", 967 IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",
968 hw_rf_kill ? "disable radio" : "enable radio"); 968 hw_rf_kill ? "disable radio" : "enable radio");
969 969
970 priv->isr_stats.rfkill++; 970 priv->isr_stats.rfkill++;
@@ -1137,7 +1137,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
1137 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)) 1137 CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))
1138 hw_rf_kill = 1; 1138 hw_rf_kill = 1;
1139 1139
1140 IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n", 1140 IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",
1141 hw_rf_kill ? "disable radio" : "enable radio"); 1141 hw_rf_kill ? "disable radio" : "enable radio");
1142 1142
1143 priv->isr_stats.rfkill++; 1143 priv->isr_stats.rfkill++;
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index ef7e6bdb0671..0912987af603 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -940,7 +940,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
940 !(cmd->meta.flags & CMD_SIZE_HUGE)); 940 !(cmd->meta.flags & CMD_SIZE_HUGE));
941 941
942 if (iwl_is_rfkill(priv)) { 942 if (iwl_is_rfkill(priv)) {
943 IWL_DEBUG_INFO(priv, "Not sending command - RF KILL"); 943 IWL_DEBUG_INFO(priv, "Not sending command - RF KILL\n");
944 return -EIO; 944 return -EIO;
945 } 945 }
946 946
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8891d6e3a0fa..2cc7e30d7743 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -926,7 +926,7 @@ static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,
926 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); 926 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
927 unsigned long status = priv->status; 927 unsigned long status = priv->status;
928 928
929 IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s\n", 929 IWL_WARN(priv, "Card state received: HW:%s SW:%s\n",
930 (flags & HW_CARD_DISABLED) ? "Kill" : "On", 930 (flags & HW_CARD_DISABLED) ? "Kill" : "On",
931 (flags & SW_CARD_DISABLED) ? "Kill" : "On"); 931 (flags & SW_CARD_DISABLED) ? "Kill" : "On");
932 932