From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 13 Dec 2012 22:08:52 +0000 (+0100)
Subject: mac80211: use del_timer_sync for final sta cleanup timer deletion
X-Git-Tag: v3.7.3~68
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a544b84195102eb875d6e7132c77ab96e45f300;p=karo-tx-linux.git

mac80211: use del_timer_sync for final sta cleanup timer deletion

commit a56f992cdabc63f56b4b142885deebebf936ff76 upstream.

This is a very old bug, but there's nothing that prevents the
timer from running while the module is being removed when we
only do del_timer() instead of del_timer_sync().

The timer should normally not be running at this point, but
it's not clearly impossible (or we could just remove this.)

Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index dc2a33de29b8..8a9931ba9e14 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -870,7 +870,7 @@ void sta_info_init(struct ieee80211_local *local)
 
 void sta_info_stop(struct ieee80211_local *local)
 {
-	del_timer(&local->sta_cleanup);
+	del_timer_sync(&local->sta_cleanup);
 	sta_info_flush(local, NULL);
 }