diff options
| author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-07-07 23:33:39 +0530 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-17 11:21:16 -0400 |
| commit | 6fd084a711895af4da06146900939b00688f68bb (patch) | |
| tree | b4b53ad304b77a3848c136431ff201fc3d7f5c0f | |
| parent | ac7def8f12f701e7abb06d6d43e260da63b87119 (diff) | |
mac80211: Restart STA timers only on associated state
commit 676b58c27475a9defccc025fea1cbd2b141ee539 upstream.
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.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1349a09cbd0..83d2e42d654 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1746,6 +1746,9 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) { 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)) |