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

Commit 3976b451 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: enable only rfkill interrupt when rfkill switch is on during IFF_UP 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 71e0c6c2

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}