From 04ebec141e6ec2762ff7145ee5ef465da113b190 Mon Sep 17 00:00:00 2001
From: Ronald Wahl <ronald.wahl@raritan.com>
Date: Mon, 19 Mar 2012 14:37:20 +0100
Subject: [PATCH] --- yaml --- r: 300633 b: refs/heads/master c:
 70b12f2612a6b352d16342b5952cf9f9de6c1d56 h: refs/heads/master i:   300631:
 0e0ef041843758fbd43df1be5c7212cdff483b44 v: v3

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

diff --git a/[refs] b/[refs]
index 3f95012799d1..d2e01b30dab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12d3952fc4a1cd96234bc7023bf7eefeb0bb6355
+refs/heads/master: 70b12f2612a6b352d16342b5952cf9f9de6c1d56
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index c59bc509ed6f..bb7e5189e27e 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2471,9 +2471,11 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 	if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) {
 		if (directed_tim) {
 			if (local->hw.conf.dynamic_ps_timeout > 0) {
-				local->hw.conf.flags &= ~IEEE80211_CONF_PS;
-				ieee80211_hw_config(local,
-						    IEEE80211_CONF_CHANGE_PS);
+				if (local->hw.conf.flags & IEEE80211_CONF_PS) {
+					local->hw.conf.flags &= ~IEEE80211_CONF_PS;
+					ieee80211_hw_config(local,
+							    IEEE80211_CONF_CHANGE_PS);
+				}
 				ieee80211_send_nullfunc(local, sdata, 0);
 			} else if (!local->pspolling && sdata->u.mgd.powersave) {
 				local->pspolling = true;