From 91e8b2b336827d615d627f5c82eb73a0b1cbfbaf Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 25 Feb 2012 21:40:46 +0100 Subject: [PATCH] --- yaml --- r: 290733 b: refs/heads/master c: 3431683759596409427b6726e582f3ee66082728 h: refs/heads/master i: 290731: 3325655d8932f291c629dfb99230708fe7228d11 v: v3 --- [refs] | 2 +- trunk/net/mac80211/sta_info.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 74d8c7b82af6..08dd2d9522cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54e4ffb2abb3c086637cbc75a2bfe55a8ce987c8 +refs/heads/master: 3431683759596409427b6726e582f3ee66082728 diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c index 4034ee616022..98613c8f08cf 100644 --- a/trunk/net/mac80211/sta_info.c +++ b/trunk/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);