[Gta04-owner] [PATCH 3.7nplus 4/4] net/wireless/libertas: reenable parts of todo block for powersave

Andreas Kemnade andreas at kemnade.info
Tue Dec 1 22:39:17 CET 2015


For re-enabling sleep mode after all commands are processed,
comment parts of an old todo block in. The crypto-related checks
are probably unneeded because of improved wakeup checks.

Signed-off-by: Andreas Kemnade <andreas at kemnade.info>
---
 drivers/net/wireless/libertas/cmd.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index e874655..1ff2b4c 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1427,7 +1427,7 @@ int lbs_execute_next_command(struct lbs_private *priv)
 		 * check if in power save mode, if yes, put the device back
 		 * to PS mode
 		 */
-#ifdef TODO
+#if 1
 		/*
 		 * This was the old code for libertas+wext. Someone that
 		 * understands this beast should re-code it in a sane way.
@@ -1438,8 +1438,9 @@ int lbs_execute_next_command(struct lbs_private *priv)
 		 */
 		if ((priv->psmode != LBS802_11POWERMODECAM) &&
 		    (priv->psstate == PS_STATE_FULL_POWER) &&
-		    ((priv->connect_status == LBS_CONNECTED) ||
-		    lbs_mesh_connected(priv))) {
+		    ((priv->connect_status == LBS_CONNECTED) /*||
+		    lbs_mesh_connected(priv) */)) {
+#if 0
 			if (priv->secinfo.WPAenabled ||
 			    priv->secinfo.WPA2enabled) {
 				/* check for valid WPA group keys */
@@ -1452,7 +1453,9 @@ int lbs_execute_next_command(struct lbs_private *priv)
 							PS_MODE_ACTION_ENTER_PS,
 							false);
 				}
-			} else {
+			} else
+#endif
+{
 				lbs_deb_host(
 				       "EXEC_NEXT_CMD: cmdpendingq empty, "
 				       "go back to PS_SLEEP");
-- 
1.7.10.4



More information about the Gta04-owner mailing list