mwifiex: complete blocked power save handshake in main process

Power save handshake with firmware might be blocked by on-going
data transfer.
this patch check the PS status in main process and complete
previous blocked PS handshake.
this patch also remove redudant check before call
mwifiex_check_ps_cond function.

Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Shengzhen Li <szli@marvell.com>
Tested-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 948f5c26c1f080694401ce0c9a5642def5c0a259..9e7acb48f7546ea4c8dc39793b3f2b3f4ae8354d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -308,6 +308,9 @@ process_start:
                        /* We have tried to wakeup the card already */
                        if (adapter->pm_wakeup_fw_try)
                                break;
+                       if (adapter->ps_state == PS_STATE_PRE_SLEEP)
+                               mwifiex_check_ps_cond(adapter);
+
                        if (adapter->ps_state != PS_STATE_AWAKE)
                                break;
                        if (adapter->tx_lock_flag) {
@@ -355,10 +358,8 @@ process_start:
 
                /* Check if we need to confirm Sleep Request
                   received previously */
-               if (adapter->ps_state == PS_STATE_PRE_SLEEP) {
-                       if (!adapter->cmd_sent && !adapter->curr_cmd)
-                               mwifiex_check_ps_cond(adapter);
-               }
+               if (adapter->ps_state == PS_STATE_PRE_SLEEP)
+                       mwifiex_check_ps_cond(adapter);
 
                /* * The ps_state may have been changed during processing of
                 * Sleep Request event.