diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-12-13 23:08:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:44:09 -0800 |
| commit | 9e2bd12a24c248e9b31af76f18f01c88ae32cd95 (patch) | |
| tree | bd47bb34f2e16685502a3ed8ed81d333a5fa63bd /net | |
| parent | 0c3b520e7407b92ebdcc21b80c8f7f8539601ae3 (diff) | |
| download | kernel_samsung_aries-9e2bd12a24c248e9b31af76f18f01c88ae32cd95.zip kernel_samsung_aries-9e2bd12a24c248e9b31af76f18f01c88ae32cd95.tar.gz kernel_samsung_aries-9e2bd12a24c248e9b31af76f18f01c88ae32cd95.tar.bz2 | |
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')
| -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 ca7bf10..4b40a3b 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -793,7 +793,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); } |