commit a3f11c09c33a1d2a18bf7a42fc22a660214b513e
author Srinivas Dasari <dasaris@qti.qualcomm.com> Fri Mar 20 13:15:20 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Wed Apr 08 21:01:28 2015 +0530
tree e5300210ef39ef2002b44432198600bcd82aa1f5
parent 32a7926271b0448984c9ff8d084dc440c32736f4

prima: HDD: Serialize NAN commands in sme

If scan is in progress, donot send any NAN commands to firmware.
Push the command to SME queue which blocks the command until
the scan finishes.

Change-Id: I80d04b15e378b2db875e3ccfafd5eda0208db485
CRs-Fixed: 797391

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 8ee9b31..e422272 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -653,6 +653,9 @@
     tNanRequestReq nan_req;
     VOS_STATUS status;
     int ret_val = -1;
+    struct net_device *dev = wdev->netdev;
+    hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+    tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
     hdd_context_t *pHddCtx = wiphy_priv(wiphy);
 
     if (0 == data_len)
@@ -692,7 +695,7 @@
     nan_req.request_data_len = data_len;
     nan_req.request_data = data;
 
-    status = sme_NanRequest(&nan_req);
+    status = sme_NanRequest(hHal, &nan_req, pAdapter->sessionId);
     if (VOS_STATUS_SUCCESS == status)
     {
         ret_val = 0;