diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-08-21 10:18:19 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-09-10 01:57:33 +0100 |
| commit | af6ecf0c758dda038d0f921844f81054c423945d (patch) | |
| tree | 1eb746e0feb4449cbb7dc193adfb13b1ea9d6ebc | |
| parent | 2136ff0e0ad92cba89e738040cb35f56ea8a0157 (diff) | |
iwl4965: fix rfkill set state regression
commit b2fcc0aee58a3435566dd6d8501a0b355552f28b upstream.
My current 3.11 fix:
commit 788f7a56fce1bcb2067b62b851a086fca48a0056
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.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
[bwh: Backported to 3.2: adjust filename, context, naming]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c index 77ad3bfb929..6e25c7bc575 100644 --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c @@ -872,9 +872,9 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv) set_bit(STATUS_RF_KILL_HW, &priv->status); } else { clear_bit(STATUS_RF_KILL_HW, &priv->status); - wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill); iwl_legacy_force_reset(priv, true); } + wiphy_rfkill_set_hw_state(priv->hw->wiphy, hw_rf_kill); handled |= CSR_INT_BIT_RF_KILL; } |