mac80211: merge a power save related race condition fix

SVN-Revision: 28185
owl
Felix Fietkau 2011-09-06 11:09:40 +00:00
parent 65d809ef19
commit 1c0d12c935
1 changed files with 11 additions and 0 deletions

View File

@ -344,3 +344,14 @@
if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) if (!(rates[i].flags & IEEE80211_TX_RC_MCS))
return true; return true;
} }
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -796,7 +796,7 @@ static int __must_check __sta_info_destr
BUG_ON(!sdata->bss);
atomic_dec(&sdata->bss->num_sta_ps);
- __sta_info_clear_tim_bit(sdata->bss, sta);
+ sta_info_clear_tim_bit(sta);
}
local->num_sta--;