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-23 04:59:05 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Modify regulatory apis to pdev level" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-07-12 13:17:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit bca38fbd18
3 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/hdd/src/wlan_hdd_regulatory.c
View file

@ -489,11 +489,11 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx,
static void hdd_set_dfs_region(hdd_context_t *hdd_ctx,
enum dfs_reg dfs_reg)
{
wlan_reg_set_dfs_region(hdd_ctx->hdd_psoc, dfs_reg);
wlan_reg_set_dfs_region(hdd_ctx->hdd_pdev, dfs_reg);
}
#else
static void hdd_set_dfs_region(hdd_context_t *hdd_ctx,
enum dfs_region dfs_reg)
enum dfs_region dfs_reg)
{
/* remap the ctl code to dfs region code */
@ -550,7 +550,7 @@ static int hdd_regulatory_init_no_offload(hdd_context_t *hdd_ctx,
cds_fill_and_send_ctl_to_fw(reg_info);
hdd_set_dfs_region(hdd_ctx, DFS_FCC_REG);
wlan_reg_get_dfs_region(hdd_ctx->hdd_psoc, &dfs_reg);
wlan_reg_get_dfs_region(hdd_ctx->hdd_pdev, &dfs_reg);
reg_program_config_vars(hdd_ctx, &config_vars);
ucfg_reg_set_config_vars(hdd_ctx->hdd_psoc, config_vars);
@ -774,7 +774,7 @@ void hdd_reg_notifier(struct wiphy *wiphy,
cds_fill_and_send_ctl_to_fw(&hdd_ctx->reg);
hdd_set_dfs_region(hdd_ctx, request->dfs_region);
wlan_reg_get_dfs_region(hdd_ctx->hdd_psoc, &dfs_reg);
wlan_reg_get_dfs_region(hdd_ctx->hdd_pdev, &dfs_reg);
reg_program_config_vars(hdd_ctx, &config_vars);
ucfg_reg_set_config_vars(hdd_ctx->hdd_psoc, config_vars);

13
core/sap/src/sap_fsm.c
View file

@ -1257,7 +1257,7 @@ static void sap_get_cac_dur_dfs_region(ptSapContext sap_ctx,
}
mac = PMAC_STRUCT(hal);
wlan_reg_get_dfs_region(mac->psoc, dfs_region);
wlan_reg_get_dfs_region(mac->pdev, dfs_region);
if (mac->sap.SapDfsInfo.ignore_cac) {
*cac_duration_ms = 0;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
@ -1266,17 +1266,6 @@ static void sap_get_cac_dur_dfs_region(ptSapContext sap_ctx,
}
*cac_duration_ms = DEFAULT_CAC_TIMEOUT;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("sapdfs: dfs_region=%d, chwidth=%d, seg0=%d, seg1=%d"),
*dfs_region, ch_params->ch_width,
ch_params->center_freq_seg0, ch_params->center_freq_seg1);
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,

4
core/sap/src/sap_module.c
View file

@ -2976,7 +2976,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
return QDF_STATUS_E_FAULT;
}
wlan_reg_get_dfs_region(pMac->psoc, &dfs_region);
wlan_reg_get_dfs_region(pMac->pdev, &dfs_region);
/*
* Set the JAPAN W53 restriction only if the current
@ -3072,7 +3072,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
return QDF_STATUS_E_FAULT;
}
wlan_reg_get_dfs_region(pMac->psoc, &dfs_region);
wlan_reg_get_dfs_region(pMac->pdev, &dfs_region);
/*
* The Indoor/Outdoor only random channel selection