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

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

iwl4965: fix rfkill set state regression 



My current 3.11 fix:

commit 788f7a56
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date:   Thu Aug 1 12:07:55 2013 +0200

    iwl4965: reset firmware after rfkill off

broke rfkill notification to user-space . I missed that bug, because
I compiled without CONFIG_RFKILL, sorry about that.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 89b5f74a

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

+1 −1
Original line number Diff line number Diff line
@@ -4464,9 +4464,9 @@ il4965_irq_tasklet(struct il_priv *il) 
			set_bit(S_RFKILL, &il->status);

		} else {

			clear_bit(S_RFKILL, &il->status);

			wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);

			il_force_reset(il, true);

		}

		wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);



		handled |= CSR_INT_BIT_RF_KILL;

	}