On Wed, 11 Sep 2013 09:46:00 +0200
Stanislaw Gruszka <sgruszka@xxxxxxxxxx> wrote:
> On Wed, Sep 11, 2013 at 12:30:24AM -0400, Steven Rostedt wrote:
> > 3.6.11.9-rc1 stable review patch.
> > If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> >
> > [ Upstream commit 788f7a56fce1bcb2067b62b851a086fca48a0056 ]
>
> This require follow up - upstream commit:
>
> commit b2fcc0aee58a3435566dd6d8501a0b355552f28b
> Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> Date: Wed Aug 21 10:18:19 2013 +0200
>
> iwl4965: fix rfkill set state regression
>
> which seems to be missed on the set.
>
Thanks! I added this:
>From 7bde0f4f59e18d5fceadeb6447addfb65ac6c539 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date: Wed, 21 Aug 2013 10:18:19 +0200
Subject: [PATCH] iwl4965: fix rfkill set state regression
[ Upstream commit b2fcc0aee58a3435566dd6d8501a0b355552f28b ]
My current 3.11 fix:
commit 788f7a56fce1bcb2067b62b851a086fca48a0056
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
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@xxxxxxxxxxxxxxx
Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index f6624b8..167ddec 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -4415,9 +4415,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;
}
--
1.7.10.4
-- Steve
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html