aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-06 11:09:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-09-06 11:09:40 +0000
commite8fe5418ff994acee9f3f8faa161cb7618de564c (patch)
tree69378db470f1628b66ce7e5ff58d2a08509ed28d
parent70b83bb1efbce5aaaf2b660f8447985aba578466 (diff)
downloadupstream-e8fe5418ff994acee9f3f8faa161cb7618de564c.tar.gz
upstream-e8fe5418ff994acee9f3f8faa161cb7618de564c.tar.bz2
upstream-e8fe5418ff994acee9f3f8faa161cb7618de564c.zip
mac80211: merge a power save related race condition fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28185 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch11
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--;