diff options
| author | Mahesh Kumar Kalikot Veetil <mkalikot@qca.qualcomm.com> | 2014-07-23 09:55:03 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-07-24 18:25:50 -0700 |
| commit | b23de8817b9ae50ffb93045c73f75535edc0786a (patch) | |
| tree | eb180da3d460b00f59c3e9229909fabd8ad78995 | |
| parent | 71b81ce2c47a0d4b5f1306b5dc1d09b988d6fdb1 (diff) | |
wlan: Guest AP should follow Primary AP's dfs channel
In AP+AP case, radar detection is supported only in case of SCC
mode. So if primary AP is in DFS channel, guest AP should follow
primary AP's channel.
Change-Id: I117d8d436fe00a23d3eecf625a9d9704eb548662
CRs-fixed: 698719
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index b65d7d16bb05..fcb7ff4232f8 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -4845,7 +4845,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if (!vos_concurrent_sap_sessions_running()) { /* Single AP Mode */ if (VOS_IS_DFS_CH(pConfig->channel)) - pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; + pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; } else { /* MBSSID Mode */ hdd_adapter_t *con_sap_adapter; @@ -4855,21 +4855,21 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if (con_sap_adapter) { /* we have active SAP running */ con_ch = con_sap_adapter->sessionCtx.ap.operatingChannel; - /* If this SAP is configured for ACS use CC_SAP's DFS channel */ - if (pConfig->channel == AUTO_CHANNEL_SELECT) { - if (con_ch != 0 && VOS_IS_DFS_CH(con_ch)) - pConfig->channel = con_ch; - } else if (VOS_IS_DFS_CH(con_ch) && - (pConfig->channel != con_ch)) { + if (con_ch != 0 && VOS_IS_DFS_CH(con_ch)) { + /* AP-AP DFS: secondary AP has to follow primary AP's + * channel */ hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Only SCC AP-AP DFS Permitted (ch=%d, con_ch=%d) !!", __func__, pConfig->channel, con_ch); - return -EINVAL; + "%s: Only SCC AP-AP DFS Permitted (chan=%d, con_ch=%d) !!, overriding guest AP's channel", + __func__, + pConfig->channel, + con_ch); + pConfig->channel = con_ch; } } else { /* We have idle AP interface (no active SAP running on it * When one SAP is stopped then also this condition applies */ if (VOS_IS_DFS_CH(pConfig->channel)) - pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; + pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; } } #endif |