From 4bd7f8c513c9cb5d4a2fc056456bdbe3d9abe429 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 1 Nov 2017 23:52:23 -0700 Subject: [PATCH] qcacmn: Clear the scan list before destroy cfg80211 scan list is not empty during the scan priv deinit/list destroy because of that qdf mem module triggered an assert. Clear the cfg80211 scan list before destroying the list. Change-Id: I391d3b91869d085ec6ff405b7ddca37d7002e5ca CRs-Fixed: 2136702 --- os_if/linux/scan/src/wlan_cfg80211_scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 82622f66132e..e0083004fd5c 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -1047,12 +1047,13 @@ QDF_STATUS wlan_cfg80211_scan_priv_deinit(struct wlan_objmgr_pdev *pdev) psoc = wlan_pdev_get_psoc(pdev); osif_priv = wlan_pdev_get_ospriv(pdev); + wlan_cfg80211_cleanup_scan_queue(pdev); scan_priv = osif_priv->osif_scan; - osif_priv->osif_scan = NULL; ucfg_scan_unregister_requester(psoc, scan_priv->req_id); qdf_list_destroy(&scan_priv->scan_req_q); qdf_mutex_destroy(&scan_priv->scan_req_q_lock); qdf_mem_free(scan_priv); + osif_priv->osif_scan = NULL; return QDF_STATUS_SUCCESS; }