A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove all WLAN_REG_IS_SAME_BAND_CHANNELS instances

Browse source 
Use WLAN_REG_IS_SAME_BAND_FREQS API to check if 2 channel
frequencies are on same band instead of the deprecated
WLAN_REG_IS_SAME_BAND_CHANNELS API as part of regulatory
cleanup effort.

Change-Id: I05c7a97d5217cdd725734ece457e859d5e1588c2
CRs-Fixed: 2898307
This commit is contained in:
Tushnim Bhattacharyya 2021-03-11 15:51:51 -08:00 • committed by Madan Koyyalamudi
commit 26390ec511
2 changed files with 51 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/hdd/inc/wlan_hdd_main.h
View file

@ -3354,6 +3354,20 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason);
void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
bool forced);
/**
* hdd_switch_sap_chan_freq() - Move SAP to the given channel
* @adapter: AP adapter
* @chan_freq: Channel frequency
* @forced: Force to switch channel, ignore SCC/MCC check
*
* Moves the SAP interface by invoking the function which
* executes the callback to perform channel switch using (E)CSA.
*
* Return: None
*/
void hdd_switch_sap_chan_freq(struct hdd_adapter *adapter, qdf_freq_t chan_freq,
bool forced);
#if defined(FEATURE_WLAN_CH_AVOID)
void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctx);

56
core/hdd/src/wlan_hdd_main.c
View file

@ -11389,6 +11389,30 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel,
hdd_ap_ctx->sap_config.ch_width_orig, forced);
}
void hdd_switch_sap_chan_freq(struct hdd_adapter *adapter, qdf_freq_t chan_freq,
bool forced)
{
struct hdd_ap_ctx *hdd_ap_ctx;
struct hdd_context *hdd_ctx;
if (hdd_validate_adapter(adapter))
return;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
if(wlan_hdd_validate_context(hdd_ctx))
return;
hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
hdd_debug("chan freq:%d width:%d",
chan_freq, hdd_ap_ctx->sap_config.ch_width_orig);
policy_mgr_change_sap_channel_with_csa(
hdd_ctx->psoc, adapter->vdev_id, chan_freq,
hdd_ap_ctx->sap_config.ch_width_orig, forced);
}
int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
{
struct hdd_external_acs_timer_context *timer_context;
@ -11430,7 +11454,7 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
* Return - none
*/
static void
hdd_store_sap_restart_channel(uint8_t restart_chan, uint8_t *restart_chan_store)
hdd_store_sap_restart_channel(qdf_freq_t restart_chan, qdf_freq_t *restart_chan_store)
{
uint8_t i;
@ -11461,8 +11485,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
struct hdd_adapter *adapter, *next_adapter = NULL;
uint32_t i;
bool found = false;
uint8_t restart_chan_store[SAP_MAX_NUM_SESSION] = {0};
uint8_t restart_chan, ap_chan;
qdf_freq_t restart_chan_store[SAP_MAX_NUM_SESSION] = {0};
uint8_t scc_on_lte_coex = 0;
uint32_t restart_freq, ap_chan_freq;
bool value;
@ -11483,9 +11506,6 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
continue;
}
ap_chan = wlan_reg_freq_to_chan(
hdd_ctxt->pdev,
adapter->session.ap.operating_chan_freq);
ap_chan_freq = adapter->session.ap.operating_chan_freq;
found = false;
@ -11519,10 +11539,10 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
}
if (!found) {
hdd_store_sap_restart_channel(
ap_chan,
ap_chan_freq,
restart_chan_store);
hdd_debug("ch:%d is safe. no need to change channel",
ap_chan);
hdd_debug("ch freq:%d is safe. no need to change channel",
ap_chan_freq);
hdd_adapter_dev_put_debug(adapter, dbgid);
continue;
}
@ -11546,27 +11566,25 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
continue;
}
restart_chan = 0;
restart_freq = 0;
for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
if (!restart_chan_store[i])
continue;
if (policy_mgr_is_force_scc(hdd_ctxt->psoc) &&
WLAN_REG_IS_SAME_BAND_CHANNELS(
WLAN_REG_IS_SAME_BAND_FREQS(
restart_chan_store[i],
ap_chan)) {
restart_chan = restart_chan_store[i];
ap_chan_freq)) {
restart_freq = restart_chan_store[i];
break;
}
}
if (!restart_chan) {
if (!restart_freq) {
restart_freq =
wlansap_get_safe_channel_from_pcl_and_acs_range(
WLAN_HDD_GET_SAP_CTX_PTR(adapter));
restart_chan = wlan_reg_freq_to_chan(hdd_ctxt->pdev,
restart_freq);
}
if (!restart_chan) {
if (!restart_freq) {
hdd_err("fail to restart SAP");
} else {
/*
@ -11584,8 +11602,8 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
wlan_hdd_set_sap_csa_reason(hdd_ctxt->psoc,
adapter->vdev_id,
CSA_REASON_UNSAFE_CHANNEL);
hdd_switch_sap_channel(adapter, restart_chan,
true);
hdd_switch_sap_chan_freq(adapter, restart_freq,
true);
hdd_adapter_dev_put_debug(adapter, dbgid);
if (next_adapter)
hdd_adapter_dev_put_debug(next_adapter,