diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-12-13 17:08:52 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 07:00:00 -0500 |
commit | a56f992cdabc63f56b4b142885deebebf936ff76 (patch) | |
tree | 4e26b43c6eef23c7b02b6e2c32f86ad8f4571b54 /net/mac80211/sta_info.c | |
parent | 97f97b1f5fe0878b35c8e314f98591771696321b (diff) |
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 <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 8bbd3b0fdbcc..ca9fde198188 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) | |||
884 | 884 | ||
885 | void sta_info_stop(struct ieee80211_local *local) | 885 | void sta_info_stop(struct ieee80211_local *local) |
886 | { | 886 | { |
887 | del_timer(&local->sta_cleanup); | 887 | del_timer_sync(&local->sta_cleanup); |
888 | sta_info_flush(local, NULL); | 888 | sta_info_flush(local, NULL); |
889 | } | 889 | } |
890 | 890 | ||