diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-13 23:08:52 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 13:00:00 +0100 |
| commit | a56f992cdabc63f56b4b142885deebebf936ff76 (patch) | |
| tree | 4e26b43c6eef23c7b02b6e2c32f86ad8f4571b54 /net | |
| parent | 97f97b1f5fe0878b35c8e314f98591771696321b (diff) | |
| download | linux-3.10-a56f992cdabc63f56b4b142885deebebf936ff76.tar.gz linux-3.10-a56f992cdabc63f56b4b142885deebebf936ff76.tar.bz2 linux-3.10-a56f992cdabc63f56b4b142885deebebf936ff76.zip | |
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')
| -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 8bbd3b0fdbc..ca9fde19818 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); } |