commit 3618335e6c0b925e11e700f694e788d89423f37d
author Padma, Santhosh Kumar <skpadma@qti.qualcomm.com> Tue Nov 08 17:48:34 2016 +0530
committer Anjaneedevi Kapparapu <akappa@codeaurora.org> Fri Nov 11 14:59:08 2016 +0530
tree 7a6fae2a86dda9fcca1c320ae17ab10e87c85b72
parent ecc9335d1b38205cd0588df13162c6141317574a

prima: Block scan during SCO call in wlan disconnected state

If scan is allowed in disconnected state when SCO call is in progress,
then host issues scan which can cause glitches in SCO call.

Fix this by following ways:
1. Return success to scan request in SME layer itself but does not allow
   scan request to firmware.
2. Start a timer of CSR_DISABLE_SCAN_DURING_SCO milliseconds to invoke
   hdd_cfg80211_scan_done_callback to update upper layer.

Change-Id: Ib7ca9b943601dcdbb685d208eafd22ab250625d4
CRs-Fixed: 1087166

CORE/SME/src/csr/csrApiScan.c

diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 4ee0fb9..84aed6f 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -125,6 +125,7 @@
 extern tSirRetStatus wlan_cfgGetStr(tpAniSirGlobal, tANI_U16, tANI_U8*, tANI_U32*);
 
 void csrScanGetResultTimerHandler(void *);
+void csr_handle_disable_scan(void *pv);
 static void csrPurgeScanResultByAge(void *pv);
 void csrScanIdleScanTimerHandler(void *);
 static void csrSetDefaultScanTiming( tpAniSirGlobal pMac, tSirScanType scanType, tCsrScanRequest *pScanRequest);
@@ -236,6 +237,15 @@
             smsLog(pMac, LOGE, FL("cannot allocate memory for idleScan timer"));
             break;
         }
+        status = vos_timer_init(&pMac->scan.disable_scan_during_sco_timer,
+                                VOS_TIMER_TYPE_SW,
+                                csr_handle_disable_scan,
+                                pMac);
+        if (!HAL_STATUS_SUCCESS(status)) {
+            smsLog(pMac, LOGE,
+                   FL("cannot allocate memory for disable_scan_during_sco_timer"));
+            break;
+        }
     }while(0);
     
     return (status);
@@ -264,6 +274,7 @@
     vos_timer_destroy(&pMac->scan.hTimerStaApConcTimer);
 #endif
     vos_timer_destroy(&pMac->scan.hTimerIdleScan);
+    vos_timer_destroy(&pMac->scan.disable_scan_during_sco_timer);
     return eHAL_STATUS_SUCCESS;
 }
 
@@ -7041,6 +7052,21 @@
     vos_timer_start(&pMac->scan.hTimerGetResult, CSR_SCAN_GET_RESULT_INTERVAL/PAL_TIMER_TO_MS_UNIT);
 }
 
+
+void csr_handle_disable_scan(void *pv)
+{
+    tpAniSirGlobal mac = PMAC_STRUCT(pv);
+
+    if (mac->scan.disable_scan_during_sco_timer_info.callback)
+        mac->scan.disable_scan_during_sco_timer_info.callback(
+        mac,
+        mac->scan.disable_scan_during_sco_timer_info.dev,
+        mac->scan.disable_scan_during_sco_timer_info.scan_id,
+        eHAL_STATUS_SUCCESS);
+    else
+        smsLog(mac, LOGE, FL("Callback is NULL"));
+}
+
 #ifdef WLAN_AP_STA_CONCURRENCY
 static void csrStaApConcTimerHandler(void *pv)
 {