From: sunyue5 <sunyue5@motorola.com>
Date: Tue, 21 May 2019 06:35:00 +0000 (+0800)
Subject: Allow set single channel for ACS
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e8e67cd4655a2fd6b26fa69eb8adbe64bbe05fd8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Allow set single channel for ACS

Moto uses vendor.wifi.certchannel to set single channel
for ACS

Change-Id: I6990b132d972f4a0bc2d4901b0c9e38cd5956d84
Signed-off-by: sunyue5 <sunyue5@motorola.com>
Reviewed-on: https://gerrit.mot.com/1358073
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---

diff --git a/drivers/net/wireless/scsc/nl80211_vendor.c b/drivers/net/wireless/scsc/nl80211_vendor.c
index 422ff46a4117..acce94d1f19a 100755
--- a/drivers/net/wireless/scsc/nl80211_vendor.c
+++ b/drivers/net/wireless/scsc/nl80211_vendor.c
@@ -4520,7 +4520,9 @@ static int slsi_acs_init(struct wiphy *wiphy,
 			}
 		}
 
-		if (num_channels == 1) {
+		/* BEGIN IKSAMP-9148, moto acs policy for vendor.wifi.certchannel */
+		if (num_channels == 1 && freq_list_len != 1) {
+		/* END IKSAMP-9148, moto acs policy */
 			memset(&acs_selected_channels, 0, sizeof(acs_selected_channels));
 			acs_selected_channels.ch_width = 20;
 			acs_selected_channels.hw_mode = request->hw_mode;