---

yaml --- r: 352152 b: refs/heads/master c: 6c7b519 h: refs/heads/master v: v3
git-mirror · Nov 27, 2012 · 57db9e2 · 57db9e2
1 parent bd1aee3
commit 57db9e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29936266780295c812b9b8ac27a3db669e0ed1be
+refs/heads/master: 6c7b519464cf6c64b02ea0d9e41bd2e49bbd51ce
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -2614,6 +2614,12 @@ static int wlcore_set_assoc(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 	if (ret < 0)
 		return ret;
 
+	/*
+	 * The default fw psm configuration is AUTO, while mac80211 default
+	 * setting is off (ACTIVE), so sync the fw with the correct value.
+	 */
+	ret = wl1271_ps_set_mode(wl, wlvif, STATION_ACTIVE_MODE);
+
 	return ret;
 }