commit f4e8100230a9cd94fb1cfe41fa040ca1246c1a43
author Madan Mohan Koyyalamudi <c_mkoyya@qca.qualcomm.com> Tue Nov 13 10:46:38 2012 -0800
committer Jeff Johnson <jjohnson@qca.qualcomm.com> Fri Nov 30 15:14:40 2012 -0800
tree ed71fe1a48e4add5f4c8f123b9c35ecd67e6af66
parent c0d1b3f5c3da9f6075eb5042fe9a6a1ba4a025b4

wlan: VOS ASSERT in wlan_hdd_cfg80211_stop_ap while removing P2P GO

Currently abortscan_event_var is maintained per adapter. I have
moved abortscan_event_var to hdd_scaninfo_t structure so that it
will be common for all the adapters.
Root cause: In the failure scenario while removing P2P GO
hdd_abort_mac_scan() API (which cancels all the scans) is initiated from
the wlan_hdd_cfg80211_del_beacon() API and it will wait on the Station
adapter for the abort scan completion notification but the completion
event is received on the P2P adapter.

Change-Id: If7ae6deead11276a6496b87b6769b0b99586c95c
CR-Fixed: 417218

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 7f0ce1b..014ddcd 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -230,10 +230,10 @@
         if( pHddCtx->scan_info.mScanPending != FALSE )
         { 
            int result;
-           INIT_COMPLETION(pAdapter->abortscan_event_var);
+           INIT_COMPLETION(pHddCtx->scan_info.abortscan_event_var);
            hdd_abort_mac_scan(pAdapter->pHddCtx);
            result = wait_for_completion_interruptible_timeout(
-                               &pAdapter->abortscan_event_var,
+                               &pHddCtx->scan_info.abortscan_event_var,
                                msecs_to_jiffies(WLAN_WAIT_TIME_ABORTSCAN));
            if(!result)
            {
@@ -1127,7 +1127,6 @@
       init_completion(&pAdapter->linkup_event_var);
       init_completion(&pAdapter->cancel_rem_on_chan_var);
       init_completion(&pAdapter->rem_on_chan_ready_event);
-      init_completion(&pAdapter->abortscan_event_var);
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
       init_completion(&pAdapter->offchannel_tx_event);
 #endif
@@ -3415,6 +3414,7 @@
    init_completion(&pHddCtx->standby_comp_var);
    init_completion(&pHddCtx->req_bmps_comp_var);
    init_completion(&pHddCtx->scan_info.scan_req_completion_event);
+   init_completion(&pHddCtx->scan_info.abortscan_event_var);
 
    hdd_list_init( &pHddCtx->hddAdapters, MAX_NUMBER_OF_ADAPTERS );