commit fdaf38b7d844f2dcfee09352091eb3cbd9c53516
author Pradeep Reddy POTTETI <c_ppotte@qti.qualcomm.com> Wed May 13 13:01:22 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Wed May 20 18:54:30 2015 +0530
tree 29e106d94d000e985b412f526b596389e065f65a
parent c4d9af35bed17d46b63d7166c0c1a021570b7f49

prima: Disable TDLS off-channel if peer doesn't support.

Update the TDLS off-channel support based on peer off-channel
capability. If tdls peer does not support the requested tdls off
channel do not initiate tdls channel switch request.

CRs-Fixed: 838108
Change-Id: I8c7fc268ef65db0cc8ccdfdfe3fc93ded5f735af

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 82eff8d..056a6f3 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -15214,7 +15214,9 @@
                 {
                     /* get connected peer and send disable tdls off chan */
                     connPeer = wlan_hdd_tdls_get_connected_peer(pAdapter);
-                    if (connPeer && (connPeer->isOffChannelConfigured == TRUE))
+                    if ((connPeer) &&
+                        (connPeer->isOffChannelSupported == TRUE) &&
+                        (connPeer->isOffChannelConfigured == TRUE))
                     {
                         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                                   "%s: More then one peer connected, Disable "
@@ -15236,9 +15238,13 @@
                     {
                         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                                   "%s: No TDLS Connected Peer or "
+                                  "isOffChannelSupported %d "
                                   "isOffChannelConfigured %d",
                                   __func__,
-                                  (connPeer ? connPeer->isOffChannelConfigured : -1));
+                                  (connPeer ? (connPeer->isOffChannelSupported)
+                                    : -1),
+                                  (connPeer ? (connPeer->isOffChannelConfigured)
+                                    : -1));
                     }
                 }
 
@@ -15310,39 +15316,44 @@
                             }
                         }
 
-                        suppChannelLen =
-                               tdlsLinkEstablishParams.supportedChannelsLen;
                         if  ((TRUE == pTdlsPeer->isOffChannelSupported) &&
-                             (TRUE == pTdlsPeer->isOffChannelConfigured) &&
-                             (suppChannelLen > 0) &&
-                             (suppChannelLen <= SIR_MAC_MAX_SUPP_CHANNELS))
+                             (TRUE == pTdlsPeer->isOffChannelConfigured))
                         {
-                            int offChan =  pTdlsPeer->peerParams.channel;
-                            int i = 0;
-                            for (i = 0U; i < suppChannelLen; i++)
-                            {
-                                pTdlsPeer->isOffChannelConfigured = FALSE;
-                                if (
-                                   (tdlsLinkEstablishParams.supportedChannels[i]
-                                    <= offChan) &&
-                                   (tdlsLinkEstablishParams.supportedChannels[i]
-                                    == offChan))
-                                {
-                                    pTdlsPeer->isOffChannelConfigured = TRUE;
-                                    break;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            pTdlsPeer->isOffChannelConfigured = FALSE;
+                             suppChannelLen =
+                                 tdlsLinkEstablishParams.supportedChannelsLen;
+
+                             if ((suppChannelLen > 0) &&
+                                 (suppChannelLen <= SIR_MAC_MAX_SUPP_CHANNELS))
+                             {
+                                 tANI_U8 suppPeerChannel = 0;
+                                 int i = 0;
+                                 for (i = 0U; i < suppChannelLen; i++)
+                                 {
+                                    suppPeerChannel =
+                                   tdlsLinkEstablishParams.supportedChannels[i];
+
+                                    pTdlsPeer->isOffChannelSupported = FALSE;
+                                    if (suppPeerChannel ==
+                                        pTdlsPeer->peerParams.channel)
+                                    {
+                                        pTdlsPeer->isOffChannelSupported = TRUE;
+                                        break;
+                                    }
+                                 }
+                             }
+                             else
+                             {
+                                pTdlsPeer->isOffChannelSupported = FALSE;
+                             }
                         }
                         VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
                                   "%s: TDLS channel switch request for channel "
                                   "%d isOffChannelConfigured %d suppChannelLen "
-                                  "%d", __func__, pTdlsPeer->peerParams.channel,
+                                  "%d isOffChannelSupported %d", __func__,
+                                  pTdlsPeer->peerParams.channel,
                                   pTdlsPeer->isOffChannelConfigured,
-                                  suppChannelLen);
+                                  suppChannelLen,
+                                  pTdlsPeer->isOffChannelSupported);
 
                         /* TDLS Off Channel, Enable tdls channel switch,
                            when their is only one tdls link and it supports */