---

yaml --- r: 300614 b: refs/heads/master c: 6f0756a h: refs/heads/master v: v3
git-mirror · Apr 9, 2012 · d86c917 · d86c917
1 parent 407a08d
commit d86c917
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 
 				/*