From 843ece96eb27240a2d87dc4ce4bb9c34aed37514 Mon Sep 17 00:00:00 2001 From: Abhishek Ambure Date: Tue, 28 Jan 2020 14:21:39 +0530 Subject: [PATCH] qcacld-3.0: Block ADDROAMSCANCHANNELS if specific channels configured User configures specific channel using SETROAMSCANCHANNELS command and preferred channels using ADDROAMSCANCHANNELS command. For roam scanning, "specific channels list" is preferred over "preferred channel list". Hence if user configured specific channels then block ADDROAMSCANCHANNLES command. Change-Id: Ib4e2c9ed7ca1e44c0c7e287e2ac350c3d4f3540e CRs-Fixed: 2610133 --- core/sme/src/common/sme_api.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 4417479d16e2..5b6d9616533a 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -7462,6 +7462,12 @@ sme_update_roam_scan_freq_list(mac_handle_t mac_handle, uint8_t vdev_id, } neighbor_roam_info = &mac->roam.neighborRoamInfo[vdev_id]; + if (neighbor_roam_info->cfgParams.specific_chan_info.numOfChannels) { + sme_err("Specific channel list is already configured"); + sme_release_global_lock(&mac->sme); + return QDF_STATUS_E_INVAL; + } + if (freq_list_type == QCA_PREFERRED_SCAN_FREQ_LIST) { sme_debug("Preferred frequency list: "); channel_info = &neighbor_roam_info->cfgParams.pref_chan_info;