summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-02-25 21:40:46 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-27 14:06:42 -0500
commit3431683759596409427b6726e582f3ee66082728 (patch)
tree736901410602632b4d3dbc33b019366829561487
parent54e4ffb2abb3c086637cbc75a2bfe55a8ce987c8 (diff)
downloadlinux-stable-3431683759596409427b6726e582f3ee66082728.tar.gz
linux-stable-3431683759596409427b6726e582f3ee66082728.tar.bz2
linux-stable-3431683759596409427b6726e582f3ee66082728.zip
mac80211: fix sta_info_flush() return value
The comment for sta_info_flush() states "Returns the number of removed STA entries" but that isn't actually true. Consequently, the warning when a station is still around on interface removal can never trigger and this delayed finding the timer issue the previous patch fixed. Fix the return value here to make that warning useful again. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/sta_info.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 4034ee616022..98613c8f08cf 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -865,8 +865,10 @@ int sta_info_flush(struct ieee80211_local *local,
mutex_lock(&local->sta_mtx);
list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
- if (!sdata || sdata == sta->sdata)
+ if (!sdata || sdata == sta->sdata) {
WARN_ON(__sta_info_destroy(sta));
+ ret++;
+ }
}
mutex_unlock(&local->sta_mtx);