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 c234e9d694698d294a0eccc774bfeeefab97fbf4..b19865ad302bce3530b1570a987e6b1f7bbfc603 100644 (file)
--- 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--;