diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-08-21 10:18:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-07 22:09:59 -0700 |
| commit | fde233a59d1d73459804759f280346082cfcc5be (patch) | |
| tree | 4637000a23cec1647b1ff525f3bae9bc4ba40400 | |
| parent | 9ddc34b565615be1ffd267ffd8c826d9ef097179 (diff) | |
| download | linux-stable-fde233a59d1d73459804759f280346082cfcc5be.tar.gz linux-stable-fde233a59d1d73459804759f280346082cfcc5be.tar.bz2 linux-stable-fde233a59d1d73459804759f280346082cfcc5be.zip | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 900f5f8c93ee..a8eff95ee677 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -4446,9 +4446,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; } |