From c1c2411be5da856f1cb17ebd48c7aa6c14bec109 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 12 Jan 2018 12:13:57 -0800 Subject: [PATCH] qcacld-3.0: Pass the proper frequency for RRM scans For RRM scan requests, pass the frequency instead of channel number in the scan request since the new scan component expects a frequency. Change-Id: I93d9ea7b1ff406c3f19692add2e3b6532a50ae0b CRs-Fixed: 2155488 --- core/sme/src/rrm/sme_rrm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 4f8d06892de1..2339ec3c4c8e 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -45,6 +45,7 @@ #include "rrm_global.h" #include +#include /* Roam score for a neighbor AP will be calculated based on the below * definitions. The calculated roam score will be used to select the @@ -686,6 +687,7 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) uint64_t current_time; struct scan_start_request *req; struct wlan_objmgr_vdev *vdev; + uint32_t chan_num; status = csr_roam_get_session_id_from_bssid(mac_ctx, &sme_rrm_ctx->sessionBssId, &session_id); @@ -797,13 +799,14 @@ static QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) /* set requestType to full scan */ req->scan_req.chan_list.num_chan = 1; + chan_num = sme_rrm_ctx->channelList.ChannelList[ + sme_rrm_ctx->currentIndex]; req->scan_req.chan_list.chan[0].freq = - sme_rrm_ctx->channelList.ChannelList[ - sme_rrm_ctx->currentIndex]; - sme_debug("Duration %d On channel %d ", + wlan_chan_to_freq(chan_num); + sme_debug("Duration %d On channel %d freq %d", req->scan_req.dwell_time_active, - sme_rrm_ctx->channelList.ChannelList[ - sme_rrm_ctx->currentIndex]); + chan_num, + req->scan_req.chan_list.chan[0].freq); status = ucfg_scan_start(req); wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);