From fe6a3dc230ecb3bf49706034c2fab7c1d8443349 Mon Sep 17 00:00:00 2001
From: Helmut Schaa <helmut.schaa@googlemail.com>
Date: Fri, 27 Jan 2012 11:02:51 +0100
Subject: [PATCH] --- yaml --- r: 290004 b: refs/heads/master c:
 2ab694d302b489c5aa49c360dc97149b77c96586 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c93e5dd5e8e2..e41ab3463dd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83d5cc012441531ab0bf6f99881958e964e9cf11
+refs/heads/master: 2ab694d302b489c5aa49c360dc97149b77c96586
diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c
index df8f0a2f0dee..0c79593b1bbf 100644
--- a/trunk/net/mac80211/sta_info.c
+++ b/trunk/net/mac80211/sta_info.c
@@ -750,12 +750,10 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
 
 	sta->dead = true;
 
-	if (test_sta_flag(sta, WLAN_STA_PS_STA) ||
-	    test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
+	if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
 		BUG_ON(!sdata->bss);
 
 		clear_sta_flag(sta, WLAN_STA_PS_STA);
-		clear_sta_flag(sta, WLAN_STA_PS_DRIVER);
 
 		atomic_dec(&sdata->bss->num_sta_ps);
 		sta_info_recalc_tim(sta);