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

Commit 3a41bbd5 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: log CT_CARD_DISABLED flag 



Change name from RF_CARD_DISABLED to CT_CARD_DISABLED to match the
indication from uCode, also log the debug message when the condition
detected in iwl_rx_card_state_notif()

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b377ea9

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

+7 −5
Original line number Diff line number Diff line
@@ -689,12 +689,14 @@ static void iwl_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_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s CT:%s\n",

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

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

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

			  (flags & CT_CARD_DISABLED) ?

			  "Reached" : "Not reached");



	if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED |

		     RF_CARD_DISABLED)) {

		     CT_CARD_DISABLED)) {



		iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,

			    CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);
@@ -708,10 +710,10 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, 
			iwl_write_direct32(priv, HBUS_TARG_MBX_C,

					HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED);

		}

		if (flags & RF_CARD_DISABLED)

		if (flags & CT_CARD_DISABLED)

			iwl_tt_enter_ct_kill(priv);

	}

	if (!(flags & RF_CARD_DISABLED))

	if (!(flags & CT_CARD_DISABLED))

		iwl_tt_exit_ct_kill(priv);



	if (flags & HW_CARD_DISABLED)

drivers/net/wireless/iwlwifi/iwl-commands.h

+1 −1
Original line number Diff line number Diff line
@@ -2510,7 +2510,7 @@ struct iwl_card_state_notif { 


#define HW_CARD_DISABLED   0x01

#define SW_CARD_DISABLED   0x02

#define RF_CARD_DISABLED   0x04

#define CT_CARD_DISABLED   0x04

#define RXON_CARD_DISABLED 0x10



struct iwl_ct_kill_config {