---

yaml --- r: 256361 b: refs/heads/master c: 676b58c h: refs/heads/master i: 256359: 20a7cdc v: v3
git-mirror · Jul 8, 2011 · d95ce75 · d95ce75
1 parent ff543fc
commit d95ce75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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))