diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-09-06 11:09:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-06 11:09:40 +0000 |
| commit | 1c0d12c93518711cabe9278d0812da5442259a30 (patch) | |
| tree | 7c824959ca15e7fa218315d9bc6ddf096375cb65 | |
| parent | 65d809ef19b0ed7645a2d252932159230a2848f0 (diff) | |
| download | master-31e0f0ae-1c0d12c93518711cabe9278d0812da5442259a30.tar.gz master-31e0f0ae-1c0d12c93518711cabe9278d0812da5442259a30.tar.bz2 master-31e0f0ae-1c0d12c93518711cabe9278d0812da5442259a30.zip | |
mac80211: merge a power save related race condition fix
SVN-Revision: 28185
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index c234e9d694..b19865ad30 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -344,3 +344,14 @@ if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) 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--; |