commit 36b7c5312472f9f344fab26977fc98e9e468a8ed
author Abhishek Singh <absingh@qti.qualcomm.com> Fri Mar 13 15:50:54 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Wed Mar 25 23:33:38 2015 +0530
tree dd7805236e633f573f094953af4b52c01f8a19a2
parent 4534e2b108a590eda15ba9cc3a25b4b926b5907a

wlan: Add the support of INFRA STA in cancel ROC

Support of INFRA STA is present in enter ROC but not present in
cancel ROC. Due to this the eSmeCommandRemainOnChannel
gets stuck in the SME active command.

Added the case to handle cancel ROC for INFRA STA.
Also removed the ROC support for SAP.

CRs-Fixed: 807450
Change-Id: I8116d0efbd0be390b5ae6366fb85d5a89098de32

CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 586ddae..8203248 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -236,9 +236,7 @@
                        NULL, 0 );
         }
     }
-    else if ( ( WLAN_HDD_SOFTAP== pAdapter->device_mode ) ||
-              ( WLAN_HDD_P2P_GO == pAdapter->device_mode )
-            )
+    else if (WLAN_HDD_P2P_GO == pAdapter->device_mode)
     {
         WLANSAP_DeRegisterMgmtFrame(
                 (WLAN_HDD_GET_CTX(pAdapter))->pvosContext,
@@ -314,8 +312,9 @@
               * The remain on channel callback will make sure the remain_on_chan
               * expired event is sent.
               */
-              if (( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
-                 ( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode ))
+              if ( ( WLAN_HDD_INFRA_STATION == pAdapter->device_mode ) ||
+                   ( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
+                   ( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode ))
               {
                   if (eHAL_STATUS_SUCCESS !=
                           sme_CancelRemainOnChannel( WLAN_HDD_GET_HAL_CTX( pAdapter ),
@@ -424,7 +423,8 @@
     pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress = TRUE;
     INIT_COMPLETION(pAdapter->cancel_rem_on_chan_var);
     hddLog( LOG1,"%s: Cancel Remain on Channel on timeout", __func__);
-    if ( ( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
+    if ( ( WLAN_HDD_INFRA_STATION == pAdapter->device_mode ) ||
+          ( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
            ( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode )
        )
     {
@@ -436,7 +436,7 @@
                     FL("Failed to Cancel Remain on Channel"));
         }
     }
-    else if ( WLAN_HDD_P2P_GO == pAdapter->device_mode )
+    else if (WLAN_HDD_P2P_GO == pAdapter->device_mode)
     {
         WLANSAP_CancelRemainOnChannel(
                 (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
@@ -540,9 +540,7 @@
         }
 
     }
-    else if ( ( WLAN_HDD_SOFTAP== pAdapter->device_mode ) ||
-            ( WLAN_HDD_P2P_GO == pAdapter->device_mode )
-            )
+    else if (WLAN_HDD_P2P_GO == pAdapter->device_mode)
     {
         //call sme API to start remain on channel.
         if (VOS_STATUS_SUCCESS != WLANSAP_RemainOnChannel(
@@ -980,7 +978,8 @@
      * The remain on channel callback will make sure the remain_on_chan
      * expired event is sent.
      */
-    if (( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
+    if ( ( WLAN_HDD_INFRA_STATION == pAdapter->device_mode ) ||
+         ( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
          ( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode ))
     {
         tANI_U8 sessionId = pAdapter->sessionId;
@@ -1409,9 +1408,7 @@
             goto err;
         }
     }
-    else if( ( WLAN_HDD_SOFTAP== pAdapter->device_mode ) ||
-              ( WLAN_HDD_P2P_GO == pAdapter->device_mode )
-            )
+    else if (WLAN_HDD_P2P_GO == pAdapter->device_mode)
      {
         if( VOS_STATUS_SUCCESS !=
              WLANSAP_SendAction( (WLAN_HDD_GET_CTX(pAdapter))->pvosContext,