diff --git a/[refs] b/[refs]
index 26c264331020..76efb7a62ddd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1678f84bff9b20807f7f6a45ebfb56a0c02b353
+refs/heads/master: 7c95069522d02ff144cd421be6618dce619caf7e
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 809fb9160899..ef73f8953724 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2598,7 +2598,8 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
 {
 	if (sdata->vif.type == IEEE80211_IF_TYPE_STA ||
 	    ieee80211_vif_is_mesh(&sdata->vif))
-		ieee80211_sta_timer((unsigned long)sdata);
+		queue_work(sdata->local->hw.workqueue,
+			   &sdata->u.sta.work);
 }
 
 void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local)