From: Johannes Berg 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.8-rc4~29^2~19^2~8^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a56f992cdabc63f56b4b142885deebebf936ff76;p=profile%2Fivi%2Fkernel-x86-ivi.git mac80211: use del_timer_sync for final sta cleanup timer deletion 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.) Cc: stable@vger.kernel.org Tested-by: Ben Greear Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 8bbd3b0..ca9fde1 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -884,7 +884,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); }