From 2a496ef393b2844f9edcf8bc246e74ef2588f9b4 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Tue, 17 Jan 2012 09:22:49 +0100
Subject: [PATCH] --- yaml --- r: 286209 b: refs/heads/master c:
 544204733a20200951c271f81c74930ba5424638 h: refs/heads/master i:   286207:
 9e886a4ae99180ccd4d9d29c75c164d16c64d3c0 v: v3

---
 [refs]                        | 2 +-
 trunk/net/mac80211/sta_info.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a4a24755c731..232b47dc8e3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d981e05908f85beb68ae0d935e59c5e399d2136e
+refs/heads/master: 544204733a20200951c271f81c74930ba5424638
diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c
index 3c428d4839c7..ff11f6bf8266 100644
--- a/trunk/net/mac80211/sta_info.c
+++ b/trunk/net/mac80211/sta_info.c
@@ -238,9 +238,11 @@ static void sta_unblock(struct work_struct *wk)
 	if (sta->dead)
 		return;
 
-	if (!test_sta_flag(sta, WLAN_STA_PS_STA))
+	if (!test_sta_flag(sta, WLAN_STA_PS_STA)) {
+		local_bh_disable();
 		ieee80211_sta_ps_deliver_wakeup(sta);
-	else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) {
+		local_bh_enable();
+	} else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) {
 		clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
 
 		local_bh_disable();