2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Rajkumar Manoharan <[email protected]> [ upstream commit 676b58c27475a9defccc025fea1cbd2b141ee539 ] A panic was observed when the device is failed to resume properly, and there are no running interfaces. ieee80211_reconfig tries to restart STA timers on unassociated state. Cc: [email protected] Signed-off-by: Rajkumar Manoharan <[email protected]> Signed-off-by: John W. Linville <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Index: linux-2.6.35.y/net/mac80211/mlme.c =================================================================== --- linux-2.6.35.y.orig/net/mac80211/mlme.c +++ linux-2.6.35.y/net/mac80211/mlme.c @@ -1995,6 +1995,9 @@ void ieee80211_sta_restart(struct ieee80 { struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; + if (!ifmgd->associated) + return; + if (test_and_clear_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running)) add_timer(&ifmgd->timer); if (test_and_clear_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running)) _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
