diff options
| author | gaurank kathpalia <gkathpal@codeaurora.org> | 2018-08-18 19:53:36 +0530 |
|---|---|---|
| committer | Srinivas Girigowda <sgirigow@codeaurora.org> | 2018-09-05 10:59:32 -0700 |
| commit | 30fa50cc74c765916849901f7fa4bd95f24ade25 (patch) | |
| tree | 821301a2f189d86a4e2049fb02036a16fb72a6ec | |
| parent | 16d11f36f4d87bbda6df49766eb73a6f522e8ea7 (diff) | |
| download | qcacld-30fa50cc74c765916849901f7fa4bd95f24ade25.tar.gz | |
qcacld-3.0: Add SRD channel check in restart SAP
Currently the driver doesn't have a check to bring
up a SAP on STA SCC channel if its a SRD channel
and does force SCC on it, even if SRD master mode
is not supported.
Fix is to check the SRD ini before SAP bringup
on the STA channel
Change-Id: I17f7df9ed973ecc6669f0d36a8c390c71624019b
CRs-Fixed: 2302737
Bug: 112724036
Signed-off-by: Srinivas Girigowda <sgirigow@codeaurora.org>
| -rw-r--r-- | core/cds/src/cds_concurrency.c | 9 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index ec763c3166..11235d4daa 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -10187,9 +10187,12 @@ QDF_STATUS cds_valid_sap_conc_channel_check(uint8_t *con_ch, uint8_t sap_ch) if (cds_valid_sta_channel_check(channel)) { if (CDS_IS_DFS_CH(channel) || - CDS_IS_PASSIVE_OR_DISABLE_CH(channel) || - !(hdd_ctx->config->sta_sap_scc_on_lte_coex_chan || - cds_is_safe_channel(channel))) { + CDS_IS_PASSIVE_OR_DISABLE_CH(channel) || + !(hdd_ctx->config->sta_sap_scc_on_lte_coex_chan || + cds_is_safe_channel(channel)) || + (!(hdd_ctx->config->etsi_srd_chan_in_master_mode) && + (cds_is_etsi13_regdmn_srd_chan( + cds_chan_to_freq(channel))))) { if (wma_is_hw_dbs_capable()) { temp_channel = cds_get_alternate_channel_for_sap(); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 173d711aed..e8fd27781b 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -9115,6 +9115,11 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, hdd_err("SAP not allowed on DFS channel!!"); return -EINVAL; } + if (cds_is_etsi13_regdmn_srd_chan(cds_chan_to_freq(channel) && + !(pHddCtx->config->etsi_srd_chan_in_master_mode))) { + hdd_err("SAP SRD master mode not supported. Cannot start SAP"); + return -EINVAL; + } if (cds_is_sap_mandatory_chan_list_enabled()) { if (!cds_get_sap_mandatory_chan_list_len()) |