diff options
| -rw-r--r-- | core/hdd/src/wlan_hdd_scan.c | 4 | ||||
| -rw-r--r-- | core/wma/src/wma_scan_roam.c | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index cb0b9631b988..40c68f32f28e 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1971,7 +1971,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, wlan_hdd_update_scan_rand_attrs((void *)&scan_req, (void *)request, WLAN_HDD_HOST_SCAN); - if (!hdd_conn_is_connected(station_ctx) && + if (pAdapter->device_mode == QDF_STA_MODE && + !is_p2p_scan && + !hdd_conn_is_connected(station_ctx) && (pHddCtx->config->probe_req_ie_whitelist)) { if (pHddCtx->no_of_probe_req_ouis != 0) { scan_req.voui = qdf_mem_malloc( diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 656f1dabd29f..1c91c4eb79e9 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -283,16 +283,6 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, qdf_mem_copy(cmd->mac_addr_mask, scan_req->mac_addr_mask, QDF_MAC_ADDR_SIZE); - /* probe req ie whitelisting attributes */ - cmd->ie_whitelist = scan_req->ie_whitelist; - if (cmd->ie_whitelist) { - for (i = 0; i < PROBE_REQ_BITMAP_LEN; i++) - cmd->probe_req_ie_bitmap[i] = - scan_req->probe_req_ie_bitmap[i]; - cmd->num_vendor_oui = scan_req->num_vendor_oui; - cmd->oui_field_len = scan_req->oui_field_len; - cmd->voui = (uint8_t *)scan_req + scan_req->oui_field_offset; - } if (!scan_req->p2pScanType) { WMA_LOGD("Normal Scan request"); @@ -304,6 +294,18 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, cmd->scan_ctrl_flags |= WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ; cmd->scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ; + /* probe req ie whitelisting attributes */ + cmd->ie_whitelist = scan_req->ie_whitelist; + if (cmd->ie_whitelist) { + for (i = 0; i < PROBE_REQ_BITMAP_LEN; i++) + cmd->probe_req_ie_bitmap[i] = + scan_req->probe_req_ie_bitmap[i]; + cmd->num_vendor_oui = scan_req->num_vendor_oui; + cmd->oui_field_len = scan_req->oui_field_len; + cmd->voui = (uint8_t *)scan_req + + scan_req->oui_field_offset; + } + /* * Decide burst_duration and dwell_time_active based on * what type of devices are active. |