Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c423a2b authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

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: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 58dba728

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −2
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv) 
				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))

			hw_rf_kill = 1;



		IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n",

		IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",

				hw_rf_kill ? "disable radio" : "enable radio");



		priv->isr_stats.rfkill++;
@@ -1137,7 +1137,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) 
				CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW))

			hw_rf_kill = 1;



		IWL_DEBUG_RF_KILL(priv, "RF_KILL bit toggled to %s.\n",

		IWL_WARN(priv, "RF_KILL bit toggled to %s.\n",

				hw_rf_kill ? "disable radio" : "enable radio");



		priv->isr_stats.rfkill++;

drivers/net/wireless/iwlwifi/iwl-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
	       !(cmd->meta.flags & CMD_SIZE_HUGE));



	if (iwl_is_rfkill(priv)) {

		IWL_DEBUG_INFO(priv, "Not sending command - RF KILL");

		IWL_DEBUG_INFO(priv, "Not sending command - RF KILL\n");

		return -EIO;

	}

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static void iwl3945_rx_card_state_notif(struct iwl_priv *priv, 
	u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);

	unsigned long status = priv->status;



	IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s\n",

	IWL_WARN(priv, "Card state received: HW:%s SW:%s\n",

			  (flags & HW_CARD_DISABLED) ? "Kill" : "On",

			  (flags & SW_CARD_DISABLED) ? "Kill" : "On");