diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-14 08:50:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:51:17 -0500 |
| commit | 3976b4519458b27753196e63c89b2a774129e19a (patch) | |
| tree | 3daf0babac757d02abd8b7f5a237345ba31d5a85 /drivers/net | |
| parent | 71e0c6c267595f406cf0e0699bacf10098e0f387 (diff) | |
| download | blackbird-op-linux-3976b4519458b27753196e63c89b2a774129e19a.tar.gz blackbird-op-linux-3976b4519458b27753196e63c89b2a774129e19a.zip | |
iwlegacy: enable only rfkill interrupt when rfkill switch is on during IFF_UP
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 24a3bbc23eb8..cf1486132eea 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -5523,13 +5523,11 @@ __il4965_up(struct il_priv *il) /* If platform's RF_KILL switch is NOT set to KILL */ if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) clear_bit(S_RF_KILL_HW, &il->status); - else + else { set_bit(S_RF_KILL_HW, &il->status); - - if (il_is_rfkill(il)) { wiphy_rfkill_set_hw_state(il->hw->wiphy, true); - il_enable_interrupts(il); + il_enable_rfkill_int(il); IL_WARN("Radio disabled by HW RF Kill switch\n"); return 0; } |
