The timer restart is done wrongly, we shouldn't set the REQ_RUN
bit when the scan has finished if it hadn't been set before the
scan started. If the timer fires during the scan, it will set
REQ_RUN and then we can run the work for it, if it didn't fire
then we shouldn't run its work either.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
net/mac80211/mlme.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- everything.orig/net/mac80211/mlme.c 2008-09-10 23:57:52.000000000 +0200
+++ everything/net/mac80211/mlme.c 2008-09-10 23:57:55.000000000 +0200
@@ -2629,7 +2629,8 @@ static void ieee80211_restart_sta_timer(
{
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)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
