diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index b8377efb3ba7..954b8ae2c880 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -689,12 +689,14 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, | |||
689 | u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); | 689 | u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); |
690 | unsigned long status = priv->status; | 690 | unsigned long status = priv->status; |
691 | 691 | ||
692 | IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s\n", | 692 | IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s CT:%s\n", |
693 | (flags & HW_CARD_DISABLED) ? "Kill" : "On", | 693 | (flags & HW_CARD_DISABLED) ? "Kill" : "On", |
694 | (flags & SW_CARD_DISABLED) ? "Kill" : "On"); | 694 | (flags & SW_CARD_DISABLED) ? "Kill" : "On", |
695 | (flags & CT_CARD_DISABLED) ? | ||
696 | "Reached" : "Not reached"); | ||
695 | 697 | ||
696 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | | 698 | if (flags & (SW_CARD_DISABLED | HW_CARD_DISABLED | |
697 | RF_CARD_DISABLED)) { | 699 | CT_CARD_DISABLED)) { |
698 | 700 | ||
699 | iwl_write32(priv, CSR_UCODE_DRV_GP1_SET, | 701 | iwl_write32(priv, CSR_UCODE_DRV_GP1_SET, |
700 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 702 | CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
@@ -708,10 +710,10 @@ static void iwl_rx_card_state_notif(struct iwl_priv *priv, | |||
708 | iwl_write_direct32(priv, HBUS_TARG_MBX_C, | 710 | iwl_write_direct32(priv, HBUS_TARG_MBX_C, |
709 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); | 711 | HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED); |
710 | } | 712 | } |
711 | if (flags & RF_CARD_DISABLED) | 713 | if (flags & CT_CARD_DISABLED) |
712 | iwl_tt_enter_ct_kill(priv); | 714 | iwl_tt_enter_ct_kill(priv); |
713 | } | 715 | } |
714 | if (!(flags & RF_CARD_DISABLED)) | 716 | if (!(flags & CT_CARD_DISABLED)) |
715 | iwl_tt_exit_ct_kill(priv); | 717 | iwl_tt_exit_ct_kill(priv); |
716 | 718 | ||
717 | if (flags & HW_CARD_DISABLED) | 719 | if (flags & HW_CARD_DISABLED) |