From d86c9175bff7e75724f5008d745747ce755416b1 Mon Sep 17 00:00:00 2001
From: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Date: Thu, 15 Mar 2012 05:50:36 +0530
Subject: [PATCH] --- yaml --- r: 300614 b: refs/heads/master c:
 6f0756a38fc4cf016070f218bf78930b4c1f9a0f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6bf42ed07af2..454ae0f56f4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01e189182d62d6ee3603233fc88f9235e9830b92
+refs/heads/master: 6f0756a38fc4cf016070f218bf78930b4c1f9a0f
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 576fb25456dd..48d0ee3f15dc 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -2472,7 +2472,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 				ieee80211_hw_config(local,
 						    IEEE80211_CONF_CHANGE_PS);
 				ieee80211_send_nullfunc(local, sdata, 0);
-			} else {
+			} else if (!local->pspolling && sdata->u.mgd.powersave) {
 				local->pspolling = true;
 
 				/*