mwifiex: Deactive host sleep using HSCFG after it was activated manually

[linux-2.6-block.git] / drivers / net / wireless / marvell / mwifiex / cmdevt.c

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 171a257426005162a684eab1d49b23c1109602fc..d6a61f850c6fe9a735c8c72f8f59715827502a2a 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -608,6 +608,11 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no,
                return -1;
        }
 
+       if (priv->adapter->hs_activated_manually &&
+           cmd_no != HostCmd_CMD_802_11_HS_CFG_ENH) {
+               mwifiex_cancel_hs(priv, MWIFIEX_ASYNC_CMD);
+               priv->adapter->hs_activated_manually = false;
+       }
 
        /* Get a new command node */
        cmd_node = mwifiex_get_cmd_node(adapter);
@@ -714,6 +719,15 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
                }
        }
 
+       /* Same with exit host sleep cmd, luckily that can't happen at the same time as EXIT_PS */
+       if (command == HostCmd_CMD_802_11_HS_CFG_ENH) {
+               struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg =
+                       &host_cmd->params.opt_hs_cfg;
+
+               if (le16_to_cpu(hs_cfg->action) == HS_ACTIVATE)
+                               add_tail = false;
+       }
+
        spin_lock_bh(&adapter->cmd_pending_q_lock);
        if (add_tail)
                list_add_tail(&cmd_node->list, &adapter->cmd_pending_q);
@@ -1216,6 +1230,13 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter)
                    __func__);
 
        adapter->if_ops.wakeup(adapter);
+
+       if (adapter->hs_activated_manually) {
+               mwifiex_cancel_hs(mwifiex_get_priv (adapter, MWIFIEX_BSS_ROLE_ANY),
+                                 MWIFIEX_ASYNC_CMD);
+               adapter->hs_activated_manually = false;
+       }
+
        adapter->hs_activated = false;
        clear_bit(MWIFIEX_IS_HS_CONFIGURED, &adapter->work_flags);
        clear_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags);