commit 16d83331099f2e47c466d9fab99d0f5053c4aac7
author Pradeep Reddy POTTETI <c_ppotte@qti.qualcomm.com> Thu Mar 26 18:28:13 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Thu Apr 02 18:53:10 2015 +0530
tree 8ac8adb99dd0675c5a7bee1bd0402318fa93002a
parent a9991b641fa1cafc8f2009500fdb51c754202999

prima: Display tdls off channel status

Display tdls off channel status is enabled or disabled
through wifi_hal api.

Change-Id: I81bb48c01e3502e2d45d845de3015607b9ea35df
CRS-Fixed: 814331

CORE/HDD/inc/wlan_hdd_tdls.h

diff --git a/CORE/HDD/inc/wlan_hdd_tdls.h b/CORE/HDD/inc/wlan_hdd_tdls.h
index 4e9202a..73ef6c0 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -218,6 +218,7 @@
     tTDLSLinkReason reason;
     cfg80211_exttdls_callback state_change_notification;
     tANI_BOOLEAN   isOffChannelConfigured;
+    tANI_BOOLEAN   isOffChannelEstablished;
     tdls_req_params_t peerParams;
 } hddTdlsPeer_t;
 

CORE/HDD/src/wlan_hdd_cfg80211.c

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 32d6a09..b33f943 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -15050,6 +15050,7 @@
                                   "%s: More then one peer connected, Disable "
                                   "TDLS channel switch", __func__);
 
+                        connPeer->isOffChannelEstablished = FALSE;
                         ret = sme_SendTdlsChanSwitchReq(
                                            WLAN_HDD_GET_HAL_CTX(pAdapter),
                                            pAdapter->sessionId,
@@ -15149,6 +15150,8 @@
                             VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                                   "%s: Send TDLS channel switch request for channel %d",
                                   __func__, pTdlsPeer->peerParams.channel);
+
+                            pTdlsPeer->isOffChannelEstablished = TRUE;
                             ret = sme_SendTdlsChanSwitchReq(WLAN_HDD_GET_HAL_CTX(pAdapter),
                                                            pAdapter->sessionId,
                                                            pTdlsPeer->peerMac,
@@ -15260,6 +15263,7 @@
                             (connPeer->isOffChannelSupported == TRUE) &&
                             (connPeer->isOffChannelConfigured == TRUE))
                         {
+                            connPeer->isOffChannelEstablished = TRUE;
                             status = sme_SendTdlsChanSwitchReq(
                                          WLAN_HDD_GET_HAL_CTX(pAdapter),
                                          pAdapter->sessionId,
@@ -15274,10 +15278,12 @@
                         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                                   "%s: TDLS channel switch "
                                   "isOffChannelSupported %d "
-                                  "isOffChannelConfigured %d",
+                                  "isOffChannelConfigured %d "
+                                  "isOffChannelEstablished %d",
                                   __func__,
                                   (connPeer ? connPeer->isOffChannelSupported : -1),
-                                  (connPeer ? connPeer->isOffChannelConfigured : -1));
+                                  (connPeer ? connPeer->isOffChannelConfigured : -1),
+                                  (connPeer ? connPeer->isOffChannelEstablished : -1));
                     }
                     else
                     {

CORE/HDD/src/wlan_hdd_tdls.c

diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 42e2ab5..ac9fad6 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -2895,7 +2895,15 @@
             *state = WIFI_TDLS_TRYING;
             break;
         case eTDLS_LINK_CONNECTED:
-            *state = WIFI_TDLS_ESTABLISHED;
+            if ((TRUE == curr_peer->isOffChannelConfigured) &&
+                (TRUE == curr_peer->isOffChannelEstablished))
+            {
+                *state = WIFI_TDLS_ESTABLISHED_OFF_CHANNEL;
+            }
+            else
+            {
+                *state = WIFI_TDLS_ESTABLISHED;
+            }
             break;
         case eTDLS_LINK_TEARING:
             *state = WIFI_TDLS_DROPPED;