diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-13 23:08:52 +0100 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2013-01-18 12:01:17 +0100 |
| commit | 28c520fbe246adf3ca08eb5d4f8a75e379fc9d3f (patch) | |
| tree | e3f44f5fcce68b4f06c25a8f87928b7aa7e85b76 /net/mac80211 | |
| parent | 2f291c480784e56ac7480522ac4630bce28e78b9 (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 56987bc1d0f6..67ccd87e4c5a 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -844,7 +844,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); } |