diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 99a624c8dbe3..10637c249992 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4306,11 +4306,9 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada union iwreq_data wrqu; tSirUpdateIE updateIE; unsigned long rc; - struct hdd_scan_info *scan_info = NULL; ENTER(); - scan_info = &adapter->scan_info; hdd_debug("Disabling queues"); wlan_hdd_netif_queue_control(adapter, WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER, @@ -4370,8 +4368,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada wireless_send_event(adapter->dev, SIOCGIWAP, &wrqu, NULL); } - if (scan_info != NULL && scan_info->mScanPending) - wlan_hdd_scan_abort(adapter); + wlan_hdd_scan_abort(adapter); wlan_hdd_cleanup_remain_on_channel_ctx(adapter); hdd_clear_fils_connection_info(adapter); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 864e9b44aaae..ac311476ea9b 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1433,13 +1433,10 @@ int wlan_hdd_vendor_abort_scan( int wlan_hdd_scan_abort(struct hdd_adapter *adapter) { struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - struct hdd_scan_info *pScanInfo = NULL; - pScanInfo = &adapter->scan_info; + wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID, + adapter->sessionId, INVALID_SCAN_ID, true); - if (pScanInfo->mScanPending) - wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID, - adapter->sessionId, INVALID_SCAN_ID, true); return 0; }