From d95ce753cb01820b6b7a36dc58dee4e1650197b3 Mon Sep 17 00:00:00 2001 From: Rajkumar Manoharan Date: Thu, 7 Jul 2011 23:33:39 +0530 Subject: [PATCH] --- yaml --- r: 256361 b: refs/heads/master c: 676b58c27475a9defccc025fea1cbd2b141ee539 h: refs/heads/master i: 256359: 20a7cdc9dde2b897413cb65549ac201a41326a35 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 507b518c578f..285ad4cd65d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 565dfefbe196206bc1e40bf92e7c5d53e9d9f706 +refs/heads/master: 676b58c27475a9defccc025fea1cbd2b141ee539 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 182cda66ebef..b6d9bd5f4d3c 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -2215,6 +2215,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))