From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 6 Sep 2011 11:09:40 +0000 (+0000)
Subject: mac80211: merge a power save related race condition fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1c0d12c93518711cabe9278d0812da5442259a30;p=openwrt%2Fstaging%2Fjow.git

mac80211: merge a power save related race condition fix

SVN-Revision: 28185
---

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--;