]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: use del_timer_sync for final sta cleanup timer deletion
authorJohannes Berg <johannes.berg@intel.com>
Thu, 13 Dec 2012 22:08:52 +0000 (23:08 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 3 Jan 2013 12:00:00 +0000 (13:00 +0100)
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 <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/sta_info.c

index 8bbd3b0fdbcc88e3c50ab21e1db769029557b23a..ca9fde1981889a559efa6b49385f071f1475a06f 100644 (file)
@@ -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);
 }