diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 340b0c1bf3..e6b7de510a 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -199,8 +199,6 @@ __wlan_config_sched_scan_plan(struct pno_scan_req_params *pno_req, pno_req->fast_scan_max_cycles = scan_timer_repeat_value; pno_req->slow_scan_period = (slow_scan_multiplier * pno_req->fast_scan_period); - osif_debug("Base scan interval: %d sec PNO Scan Timer Repeat Value: %d", - (request->interval / 1000), scan_timer_repeat_value); } #endif @@ -446,10 +444,13 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, enable_dfs_pno_chnl_scan = ucfg_scan_is_dfs_chnl_scan_enabled(psoc); if (request->n_channels) { - char *chl = qdf_mem_malloc((request->n_channels * 5) + 1); + uint32_t buff_len; + char *chl; int len = 0; bool ap_or_go_present = wlan_cfg80211_is_ap_go_present(psoc); + buff_len = (request->n_channels * 5) + 1; + chl = qdf_mem_malloc(buff_len); if (!chl) { ret = -ENOMEM; goto error; @@ -482,11 +483,10 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, if (!ok) continue; } - len += snprintf(chl + len, 5, "%d ", chan_freq); + len += qdf_scnprintf(chl + len, buff_len - len, " %d", chan_freq); valid_ch[num_chan++] = chan_freq; } - osif_notice("No. of Scan Channels: %d", num_chan); - osif_notice("Channel-List: %s", chl); + osif_debug("Channel-List[%d]:%s", num_chan, chl); qdf_mem_free(chl); chl = NULL; /* If all channels are DFS and dropped, @@ -519,10 +519,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, req->networks_list[i].encryption = 0; /*eED_ANY */ req->networks_list[i].bc_new_type = 0; /*eBCAST_UNKNOWN */ - osif_notice("Received ssid:%.*s", - req->networks_list[i].ssid.length, - req->networks_list[i].ssid.ssid); - /*Copying list of valid channel into request */ qdf_mem_copy(req->networks_list[i].channels, valid_ch, num_chan * sizeof(uint32_t)); @@ -552,8 +548,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, j++; } } - osif_notice("Number of hidden networks being Configured = %d", - request->n_ssids); /* * Before Kernel 4.4 @@ -575,9 +569,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, wlan_config_sched_scan_plan(req, request); req->delay_start_time = wlan_config_sched_scan_start_delay(request); req->scan_backoff_multiplier = scan_backoff_multiplier; - osif_notice("Base scan interval: %d sec, scan cycles: %d, slow scan interval %d", - req->fast_scan_period, req->fast_scan_max_cycles, - req->slow_scan_period); + wlan_hdd_sched_scan_update_relative_rssi(req, request); psoc = wlan_pdev_get_psoc(pdev); @@ -590,6 +582,20 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, if (ucfg_ie_whitelist_enabled(psoc, vdev)) ucfg_copy_ie_whitelist_attrs(psoc, &req->ie_whitelist); + + osif_debug("Network count %d n_ssids %d fast_scan_period: %d msec slow_scan_period: %d msec, fast_scan_max_cycles: %d, relative_rssi %d band_pref %d, rssi_pref %d", + req->networks_cnt, request->n_ssids, req->fast_scan_period, + req->slow_scan_period, req->fast_scan_max_cycles, + req->relative_rssi, req->band_rssi_pref.band, + req->band_rssi_pref.rssi); + + for (i = 0; i < req->networks_cnt; i++) + osif_debug("[%d] ssid: %.*s, RSSI th %d bc NW type %u", + i, req->networks_list[i].ssid.length, + req->networks_list[i].ssid.ssid, + req->networks_list[i].rssi_thresh, + req->networks_list[i].bc_new_type); + status = ucfg_scan_pno_start(vdev, req); if (QDF_IS_STATUS_ERROR(status)) { osif_err("Failed to enable PNO"); @@ -597,8 +603,6 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev, goto error; } - osif_info("PNO scan request offloaded"); - error: qdf_mem_free(req); return ret; @@ -610,9 +614,7 @@ int wlan_cfg80211_sched_scan_stop(struct wlan_objmgr_vdev *vdev) status = ucfg_scan_pno_stop(vdev); if (QDF_IS_STATUS_ERROR(status)) - osif_err("Failed to disabled PNO"); - else - osif_info("PNO scan disabled"); + osif_debug("Failed to disable PNO"); return 0; } diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index 35059fde89..8944072add 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -190,12 +190,12 @@ QDF_STATUS ucfg_scan_pno_stop(struct wlan_objmgr_vdev *vdev) } if (!scan_vdev_obj->pno_in_progress) { scm_debug("pno already stopped"); - return QDF_STATUS_E_ALREADY; + return QDF_STATUS_SUCCESS; } status = tgt_scan_pno_stop(vdev, wlan_vdev_get_id(vdev)); if (QDF_IS_STATUS_ERROR(status)) - scm_err("pno start failed"); + scm_err("pno stop failed"); else scan_vdev_obj->pno_in_progress = false; diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index d19b953403..972d7f8a0d 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -4838,9 +4838,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, cmd->delay_start_time = WMI_SEC_TO_MSEC(pno->delay_start_time); cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles; cmd->scan_backoff_multiplier = pno->scan_backoff_multiplier; - WMI_LOGD("fast_scan_period: %d msec slow_scan_period: %d msec", - cmd->fast_scan_period, cmd->slow_scan_period); - WMI_LOGD("fast_scan_max_cycles: %d", cmd->fast_scan_max_cycles); /* mac randomization attributes */ if (pno->scan_random.randomize) { @@ -4855,7 +4852,7 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); cmd->no_of_ssids = QDF_MIN(pno->networks_cnt, WMI_NLO_MAX_SSIDS); - WMI_LOGD("SSID count : %d", cmd->no_of_ssids); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, cmd->no_of_ssids * sizeof(nlo_configured_parameters)); buf_ptr += WMI_TLV_HDR_SIZE; @@ -4873,10 +4870,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, qdf_mem_copy(nlo_list[i].ssid.ssid.ssid, pno->networks_list[i].ssid.ssid, nlo_list[i].ssid.ssid.ssid_len); - WMI_LOGD("index: %d ssid: %.*s len: %d", i, - nlo_list[i].ssid.ssid.ssid_len, - (char *)nlo_list[i].ssid.ssid.ssid, - nlo_list[i].ssid.ssid.ssid_len); /* Copy rssi threshold */ if (pno->networks_list[i].rssi_thresh && @@ -4885,21 +4878,16 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, nlo_list[i].rssi_cond.valid = true; nlo_list[i].rssi_cond.rssi = pno->networks_list[i].rssi_thresh; - WMI_LOGD("RSSI threshold : %d dBm", - nlo_list[i].rssi_cond.rssi); } nlo_list[i].bcast_nw_type.valid = true; nlo_list[i].bcast_nw_type.bcast_nw_type = pno->networks_list[i].bc_new_type; - WMI_LOGD("Broadcast NW type (%u)", - nlo_list[i].bcast_nw_type.bcast_nw_type); } buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters); /* Copy channel info */ cmd->num_of_channels = QDF_MIN(pno->networks_list[0].channel_cnt, WMI_NLO_MAX_CHAN); - WMI_LOGD("Channel count: %d", cmd->num_of_channels); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, (cmd->num_of_channels * sizeof(uint32_t))); buf_ptr += WMI_TLV_HDR_SIZE; @@ -4912,8 +4900,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, channel_list[i] = wlan_chan_to_freq(pno-> networks_list[0].channels[i]); - - WMI_LOGD("Ch[%d]: %d MHz", i, channel_list[i]); } buf_ptr += cmd->num_of_channels * sizeof(uint32_t); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, @@ -4959,7 +4945,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, WMITLV_TAG_STRUC_wmi_connected_nlo_rssi_params, WMITLV_GET_STRUCT_TLVLEN(connected_nlo_rssi_params)); nlo_relative_rssi->relative_rssi = pno->relative_rssi; - WMI_LOGD("relative_rssi %d", nlo_relative_rssi->relative_rssi); buf_ptr += sizeof(*nlo_relative_rssi); /* @@ -4981,9 +4966,6 @@ static QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle, connected_nlo_bss_band_rssi_pref)); nlo_band_rssi[i].band = pno->band_rssi_pref.band; nlo_band_rssi[i].rssi_pref = pno->band_rssi_pref.rssi; - WMI_LOGI("band_pref %d, rssi_pref %d", - nlo_band_rssi[i].band, - nlo_band_rssi[i].rssi_pref); } buf_ptr += cmd->num_cnlo_band_pref * sizeof(*nlo_band_rssi);