From 9ec27ecbf213d588bb737a1f9377d43d99d1e223 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 7 Dec 2017 15:24:01 -0800 Subject: [PATCH] qcacld-3.0: Check regulatory domain before assuming ETSI channels In function add missing check for regulatory domain before assuming channel 120-130 to be ETSI weather channel. Change-Id: Ief9761b5ac06a511a4132f71c0a63c796741149d CRs-Fixed: 2150264 --- core/sap/src/sap_fsm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index a9b589b2905b..63db8eb4d711 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1350,6 +1350,12 @@ static void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx, } *cac_duration_ms = DEFAULT_CAC_TIMEOUT; + if (*dfs_region != DFS_ETSI_REG) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + FL("sapdfs: defult cac duration")); + return; + } + if (sap_is_channel_bonding_etsi_weather_channel(sap_ctx)) { *cac_duration_ms = ETSI_WEATHER_CH_CAC_TIMEOUT; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,