diff options
| author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-07-07 23:33:39 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:35 -0700 |
| commit | 148a97cd068a58b6c8553aa5775caec7ac5a0545 (patch) | |
| tree | ae25ecb606f3580d6d470b7b00fb1de894086a51 /net | |
| parent | 11e46da8ca083512f90f8251b27194108814fe24 (diff) | |
| download | kernel_samsung_smdk4412-148a97cd068a58b6c8553aa5775caec7ac5a0545.tar.gz kernel_samsung_smdk4412-148a97cd068a58b6c8553aa5775caec7ac5a0545.tar.bz2 kernel_samsung_smdk4412-148a97cd068a58b6c8553aa5775caec7ac5a0545.zip | |
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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -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 d595265d6c2..7a334fdd8d6 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2200,6 +2200,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)) |