diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-13 23:08:52 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:19 +0000 |
| commit | ac2c39824efafedca3fe02f429443cbfcd44cbaa (patch) | |
| tree | 781c0dd0c528bfa3a8aa113e8c4bfa8306260063 /net/mac80211 | |
| parent | 63dddb4936fa86057e7f94a0bd10cb8ac25bc7f3 (diff) | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/mac80211')
| -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 1c775f015daa..488600c167c9 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1021,7 +1021,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); } |