commit 93e67fff8050a18f00877048f8207468d71e2c0f
author Hoonki Lee <lhoonki@qca.qualcomm.com> Tue Mar 19 15:49:25 2013 -0700
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Mon Mar 25 17:22:34 2013 -0700
tree 2280d9ec7cb42ec5411a6226aaec4aa4bb4e00cb
parent 34d1b06694a0243a12220984757b3e63614d3eae

Postpone scan request until TDLS torn down

Introduce delayed_work and reschedule the scan request until
all TDLS peers are torn down.
Define tdls_scan_callback() and tdls_scan_done_callback() to
be called from cfg80211_scan() and cfg80211_scan_done().
Reject the scan request when TDLS connection is in progress.
Check the number of reschedule scan and allow scan if exceed max
attempt.

CRs-Fixed: 453508
Change-Id: Ieab5b72cd214b64ff041d952923533454fc98e85

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 c1cc03d..d5f5b06 100644
--- a/CORE/HDD/inc/wlan_hdd_tdls.h
+++ b/CORE/HDD/inc/wlan_hdd_tdls.h
@@ -48,6 +48,11 @@
 should not be more than 2000 */
 #define TDLS_DISCOVERY_TIMEOUT_BEFORE_UPDATE     1000
 
+#define TDLS_CTX_MAGIC 0x54444c53    // "TDLS"
+
+#define TDLS_MAX_SCAN_SCHEDULE          10
+#define TDLS_DELAY_SCAN_PER_CONNECTION 100
+
 typedef struct
 {
     tANI_U32    tdls;
@@ -62,6 +67,18 @@
     tANI_S32    rssi_teardown_threshold;
 } tdls_config_params_t;
 
+typedef struct
+{
+    struct wiphy *wiphy;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
+    struct net_device *dev;
+#endif
+    struct cfg80211_scan_request *scan_request;
+    int magic;
+    int attempt;
+    struct delayed_work tdls_scan_work;
+} tdls_scan_context_t;
+
 typedef enum {
     eTDLS_SUPPORT_NOT_ENABLED = 0,
     eTDLS_SUPPORT_DISABLED, /* suppress implicit trigger and not respond to the peer */
@@ -203,4 +220,22 @@
 
 void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter);
 
+void wlan_hdd_tdls_free_scan_request (tdls_scan_context_t *tdls_scan_ctx);
+
+int wlan_hdd_tdls_copy_scan_context(hdd_context_t *pHddCtx,
+                            struct wiphy *wiphy,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
+                            struct net_device *dev,
+#endif
+                            struct cfg80211_scan_request *request);
+
+int wlan_hdd_tdls_scan_callback (hdd_adapter_t *pAdapter,
+                                struct wiphy *wiphy,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0))
+                                struct net_device *dev,
+#endif
+                                struct cfg80211_scan_request *request);
+
+void wlan_hdd_tdls_scan_done_callback(hdd_adapter_t *pAdapter);
+
 #endif // __HDD_TDSL_H