From ec1308af61e98c9299b9eaec9398183e4abceb57 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Nov 2010 20:28:03 +0100
Subject: [PATCH] --- yaml --- r: 224686 b: refs/heads/master c:
 46090979a55a0dc2cdb3d939f94fa47742108194 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac034fef202c..516de0a79a97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ccc8bd7593634d827e8bc55898a5038e29848b5
+refs/heads/master: 46090979a55a0dc2cdb3d939f94fa47742108194
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 729aba49cf98..849d9c639add 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2021,6 +2021,7 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
 	if (test_and_clear_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running))
 		add_timer(&ifmgd->chswitch_timer);
 	ieee80211_sta_reset_beacon_monitor(sdata);
+	ieee80211_restart_sta_timer(sdata);
 }
 #endif