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-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename sme_config_params member csrConfig

Browse source 
The Linux Coding Style frowns upon mixed-case names so rename
csrConfig in struct sme_config_params to be in compliance.

Change-Id: I451d728c79608041effed09adb199a357c97c0b5
CRs-Fixed: 2428992
This commit is contained in:
Jeff Johnson 2019-04-02 15:02:56 -07:00 • committed by nshrivas
commit e94ccd0d66
6 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

58
core/hdd/src/wlan_hdd_cfg.c
View file

@ -1151,7 +1151,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get mcc to scc switch");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.cc_switch_mode = mcc_to_scc_switch;
sme_cfg->csr_config.cc_switch_mode = mcc_to_scc_switch;
if (QDF_STATUS_SUCCESS !=
ucfg_policy_mgr_get_conc_rule1(hdd_ctx->psoc,
@ -1159,7 +1159,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get conc rule1");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.conc_custom_rule1 = conc_rule1;
sme_cfg->csr_config.conc_custom_rule1 = conc_rule1;
if (QDF_STATUS_SUCCESS !=
ucfg_policy_mgr_get_conc_rule2(hdd_ctx->psoc,
@ -1167,7 +1167,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get conc rule2");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.conc_custom_rule2 = conc_rule2;
sme_cfg->csr_config.conc_custom_rule2 = conc_rule2;
if (QDF_STATUS_SUCCESS !=
ucfg_policy_mgr_get_sta_cxn_5g_band(hdd_ctx->psoc,
@ -1175,7 +1175,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get conc rule2");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.is_sta_connection_in_5gz_enabled = sta_cxn_5g;
sme_cfg->csr_config.is_sta_connection_in_5gz_enabled = sta_cxn_5g;
if (QDF_STATUS_SUCCESS !=
ucfg_policy_mgr_get_force_1x1(hdd_ctx->psoc,
@ -1183,7 +1183,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get force 1x1 flag");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.is_force_1x1 = is_force_1x1;
sme_cfg->csr_config.is_force_1x1 = is_force_1x1;
if (QDF_STATUS_SUCCESS !=
ucfg_policy_mgr_get_allow_mcc_go_diff_bi(hdd_ctx->psoc,
@ -1191,7 +1191,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
hdd_err("can't get allow mcc go diff BI flag");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.fAllowMCCGODiffBI = allow_diff_bi;
sme_cfg->csr_config.fAllowMCCGODiffBI = allow_diff_bi;
return QDF_STATUS_SUCCESS;
}
@ -1200,7 +1200,7 @@ hdd_set_sme_cfgs_related_to_plcy_mgr(struct hdd_context *hdd_ctx,
static QDF_STATUS hdd_set_sap_mcc_chnl_avoid(struct sme_config_params *sme_cfg,
uint8_t val)
{
sme_cfg->csrConfig.sap_channel_avoidance = val;
sme_cfg->csr_config.sap_channel_avoidance = val;
return QDF_STATUS_SUCCESS;
}
#else
@ -1227,14 +1227,14 @@ QDF_STATUS hdd_set_sme_cfgs_related_to_mlme(struct hdd_context *hdd_ctx,
hdd_err("Get b80211e_enabled failed");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.Is11eSupportEnabled = b80211e_enabled;
sme_cfg->csr_config.Is11eSupportEnabled = b80211e_enabled;
status = ucfg_mlme_get_wmm_mode(hdd_ctx->psoc, &wmm_mode);
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("Get wmm_mode failed");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.WMMSupportMode = hdd_to_csr_wmm_mode(wmm_mode);
sme_cfg->csr_config.WMMSupportMode = hdd_to_csr_wmm_mode(wmm_mode);
hdd_debug("wmm_mode=%d 802_11e_enabled=%d", wmm_mode, b80211e_enabled);
status = ucfg_mlme_get_mcc_feature(hdd_ctx->psoc, &enable_mcc);
@ -1242,14 +1242,14 @@ QDF_STATUS hdd_set_sme_cfgs_related_to_mlme(struct hdd_context *hdd_ctx,
hdd_err("ucfg_mlme_get_mcc_feature fail, use def");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.fEnableMCCMode = enable_mcc;
sme_cfg->csr_config.fEnableMCCMode = enable_mcc;
status = ucfg_mlme_get_mcc_rts_cts_prot(hdd_ctx->psoc, &mcc_rts_cts);
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("ucfg_mlme_get_mcc_rts_cts_prot fail, use def");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.mcc_rts_cts_prot_enable = mcc_rts_cts;
sme_cfg->csr_config.mcc_rts_cts_prot_enable = mcc_rts_cts;
status = ucfg_mlme_get_mcc_bcast_prob_resp(hdd_ctx->psoc,
&mcc_bcast_prob_rsp);
@ -1257,7 +1257,7 @@ QDF_STATUS hdd_set_sme_cfgs_related_to_mlme(struct hdd_context *hdd_ctx,
hdd_err("ucfg_mlme_get_mcc_bcast_prob_resp fail, use def");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.mcc_bcast_prob_resp_enable = mcc_bcast_prob_rsp;
sme_cfg->csr_config.mcc_bcast_prob_resp_enable = mcc_bcast_prob_rsp;
status = ucfg_mlme_get_sta_miracast_mcc_rest_time(hdd_ctx->psoc,
&mcast_mcc_rest_time);
@ -1265,7 +1265,7 @@ QDF_STATUS hdd_set_sme_cfgs_related_to_mlme(struct hdd_context *hdd_ctx,
hdd_err("ucfg_mlme_get_sta_miracast_mcc_rest_time, use def");
return QDF_STATUS_E_FAILURE;
}
sme_cfg->csrConfig.f_sta_miracast_mcc_rest_time_val =
sme_cfg->csr_config.f_sta_miracast_mcc_rest_time_val =
mcast_mcc_rest_time;
status = ucfg_mlme_get_sap_mcc_chnl_avoid(hdd_ctx->psoc,
&sap_mcc_avoid);
@ -1317,7 +1317,7 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
/* Config params obtained from the registry
* To Do: set regulatory information here
*/
sme_config->csrConfig.phyMode =
sme_config->csr_config.phyMode =
hdd_cfg_xlate_to_csr_phy_mode(config->dot11Mode);
if (config->dot11Mode == eHDD_DOT11_MODE_abg ||
@ -1325,31 +1325,31 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
config->dot11Mode == eHDD_DOT11_MODE_11g ||
config->dot11Mode == eHDD_DOT11_MODE_11b_ONLY ||
config->dot11Mode == eHDD_DOT11_MODE_11g_ONLY) {
sme_config->csrConfig.channelBondingMode24GHz = 0;
sme_config->csrConfig.channelBondingMode5GHz = 0;
sme_config->csr_config.channelBondingMode24GHz = 0;
sme_config->csr_config.channelBondingMode5GHz = 0;
} else {
ucfg_mlme_get_channel_bonding_24ghz(hdd_ctx->psoc,
&channel_bonding_mode);
sme_config->csrConfig.channelBondingMode24GHz =
sme_config->csr_config.channelBondingMode24GHz =
channel_bonding_mode;
ucfg_mlme_get_channel_bonding_5ghz(hdd_ctx->psoc,
&channel_bonding_mode);
sme_config->csrConfig.channelBondingMode5GHz =
sme_config->csr_config.channelBondingMode5GHz =
channel_bonding_mode;
}
/* Remaining config params not obtained from registry
* On RF EVB beacon using channel 1.
*/
/* This param cannot be configured from INI */
sme_config->csrConfig.send_smps_action = true;
sme_config->csrConfig.AdHocChannel5G = ibss_cfg.adhoc_ch_5g;
sme_config->csrConfig.AdHocChannel24 = ibss_cfg.adhoc_ch_2g;
sme_config->csrConfig.ProprietaryRatesEnabled = 0;
sme_config->csrConfig.HeartbeatThresh50 = 40;
sme_config->csr_config.send_smps_action = true;
sme_config->csr_config.AdHocChannel5G = ibss_cfg.adhoc_ch_5g;
sme_config->csr_config.AdHocChannel24 = ibss_cfg.adhoc_ch_2g;
sme_config->csr_config.ProprietaryRatesEnabled = 0;
sme_config->csr_config.HeartbeatThresh50 = 40;
ucfg_scan_cfg_get_dfs_chan_scan_allowed(hdd_ctx->psoc,
&enable_dfs_scan);
sme_config->csrConfig.fEnableDFSChnlScan = enable_dfs_scan;
sme_config->csrConfig.Csr11dinfo.Channels.numChannels = 0;
sme_config->csr_config.fEnableDFSChnlScan = enable_dfs_scan;
sme_config->csr_config.Csr11dinfo.Channels.numChannels = 0;
hdd_set_power_save_offload_config(hdd_ctx);
@ -1370,19 +1370,19 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx)
hdd_ctx->psoc, false);
}
sme_config->csrConfig.isCoalesingInIBSSAllowed =
sme_config->csr_config.isCoalesingInIBSSAllowed =
ibss_cfg.coalesing_enable;
/* Update maximum interfaces information */
sme_config->csrConfig.max_intf_count = hdd_ctx->max_intf_count;
sme_config->csr_config.max_intf_count = hdd_ctx->max_intf_count;
hdd_set_fine_time_meas_cap(hdd_ctx);
cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs);
sme_config->csrConfig.sta_roam_policy_params.dfs_mode =
sme_config->csr_config.sta_roam_policy_params.dfs_mode =
CSR_STA_ROAM_POLICY_DFS_ENABLED;
sme_config->csrConfig.sta_roam_policy_params.skip_unsafe_channels = 0;
sme_config->csr_config.sta_roam_policy_params.skip_unsafe_channels = 0;
status = hdd_set_sme_cfgs_related_to_mlme(hdd_ctx, sme_config);
if (!QDF_IS_STATUS_SUCCESS(status))

10
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -6836,7 +6836,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
cfg_val = nla_get_u8(tb[
QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_WMM_ENABLE]);
if (!cfg_val) {
sme_config->csrConfig.WMMSupportMode =
sme_config->csr_config.WMMSupportMode =
hdd_to_csr_wmm_mode(HDD_WMM_USER_MODE_NO_QOS);
hdd_debug("wmm is disabled");
} else {
@ -6846,7 +6846,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
hdd_err("Get wmm_mode failed");
return QDF_STATUS_E_FAILURE;
}
sme_config->csrConfig.WMMSupportMode =
sme_config->csr_config.WMMSupportMode =
hdd_to_csr_wmm_mode(wmm_mode);
hdd_debug("using wmm default value");
}
@ -6896,7 +6896,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy,
if (tb[QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_WEP_TKIP_IN_HE]) {
cfg_val = nla_get_u8(tb[
QCA_WLAN_VENDOR_ATTR_WIFI_TEST_CONFIG_WEP_TKIP_IN_HE]);
sme_config->csrConfig.wep_tkip_in_he = cfg_val;
sme_config->csr_config.wep_tkip_in_he = cfg_val;
hdd_debug("Set WEP/TKIP allow in HE %d", cfg_val);
update_sme_cfg = true;
@ -16556,11 +16556,11 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
*/
ucfg_mlme_get_channel_bonding_5ghz(hdd_ctx->psoc,
&channel_bonding_mode);
sme_config->csrConfig.channelBondingMode5GHz =
sme_config->csr_config.channelBondingMode5GHz =
channel_bonding_mode;
ucfg_mlme_get_channel_bonding_24ghz(hdd_ctx->psoc,
&channel_bonding_mode);
sme_config->csrConfig.channelBondingMode24GHz =
sme_config->csr_config.channelBondingMode24GHz =
channel_bonding_mode;
sme_update_config(mac_handle, sme_config);
qdf_mem_free(sme_config);

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

@ -3663,7 +3663,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
switch (channel_type) {
case NL80211_CHAN_HT20:
case NL80211_CHAN_NO_HT:
sme_config->csrConfig.obssEnabled = false;
sme_config->csr_config.obssEnabled = false;
sap_config->sec_ch = 0;
break;
case NL80211_CHAN_HT40MINUS:
@ -3677,7 +3677,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
qdf_mem_free(sme_config);
return -EINVAL;
}
sme_config->csrConfig.obssEnabled =
sme_config->csr_config.obssEnabled =
wlan_hdd_get_sap_obss(adapter);
sme_update_config(mac_handle, sme_config);
@ -5434,13 +5434,13 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
* may not be good with non QOS 11N AP
* Default: enable QOS for SAP unless WMM IE not present for 11bga
*/
sme_config->csrConfig.WMMSupportMode = eCsrRoamWmmAuto;
sme_config->csr_config.WMMSupportMode = eCsrRoamWmmAuto;
ie = wlan_get_vendor_ie_ptr_from_oui(WMM_OUI_TYPE, WMM_OUI_TYPE_SIZE,
beacon->tail, beacon->tail_len);
if (!ie && (config->SapHw_mode == eCSR_DOT11_MODE_11a ||
config->SapHw_mode == eCSR_DOT11_MODE_11g ||
config->SapHw_mode == eCSR_DOT11_MODE_11b))
sme_config->csrConfig.WMMSupportMode = eCsrRoamWmmNoQos;
sme_config->csr_config.WMMSupportMode = eCsrRoamWmmNoQos;
sme_update_config(mac_handle, sme_config);
if (!((adapter->device_mode == QDF_SAP_MODE) &&

28
core/hdd/src/wlan_hdd_wext.c
View file

@ -3938,6 +3938,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
bool band_24 = false, band_5g = false;
bool ch_bond24 = false, ch_bond5g = false;
struct sme_config_params *sme_config;
struct csr_config_params *csr_config;
uint32_t chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
uint8_t vhtchanwidth;
eCsrPhyMode phymode = -EIO, old_phymode;
@ -4179,11 +4180,12 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
}
qdf_mem_zero(sme_config, sizeof(*sme_config));
sme_get_config_param(mac_handle, sme_config);
sme_config->csrConfig.phyMode = phymode;
csr_config = &sme_config->csr_config;
csr_config->phyMode = phymode;
#ifdef QCA_HT_2040_COEX
if (phymode == eCSR_DOT11_MODE_11n &&
chwidth == WNI_CFG_CHANNEL_BONDING_MODE_DISABLE) {
sme_config->csrConfig.obssEnabled = false;
csr_config->obssEnabled = false;
status = sme_set_ht2040_mode(mac_handle,
adapter->vdev_id,
eHT_CHAN_HT20, false);
@ -4194,7 +4196,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
}
} else if (phymode == eCSR_DOT11_MODE_11n &&
chwidth == WNI_CFG_CHANNEL_BONDING_MODE_ENABLE) {
sme_config->csrConfig.obssEnabled = true;
csr_config->obssEnabled = true;
status = sme_set_ht2040_mode(mac_handle,
adapter->vdev_id,
eHT_CHAN_HT20, true);
@ -4220,22 +4222,22 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
}
}
if (curr_band == BAND_2G)
sme_config->csrConfig.channelBondingMode24GHz = chwidth;
csr_config->channelBondingMode24GHz = chwidth;
else if (curr_band == BAND_5G)
sme_config->csrConfig.channelBondingMode5GHz = chwidth;
csr_config->channelBondingMode5GHz = chwidth;
else {
sme_config->csrConfig.channelBondingMode24GHz = chwidth;
sme_config->csrConfig.channelBondingMode5GHz = chwidth;
csr_config->channelBondingMode24GHz = chwidth;
csr_config->channelBondingMode5GHz = chwidth;
}
sme_update_config(mac_handle, sme_config);
hdd_ctx->config->dot11Mode = hdd_dot11mode;
ucfg_mlme_set_channel_bonding_24ghz(
hdd_ctx->psoc,
sme_config->csrConfig.channelBondingMode24GHz);
csr_config->channelBondingMode24GHz);
ucfg_mlme_set_channel_bonding_5ghz(
hdd_ctx->psoc,
sme_config->csrConfig.channelBondingMode5GHz);
csr_config->channelBondingMode5GHz);
if (hdd_update_config_cfg(hdd_ctx) == false) {
hdd_err("could not update config_dat");
retval = -EIO;
@ -4341,8 +4343,8 @@ static int hdd_we_set_ch_width(struct hdd_adapter *adapter, int ch_width)
goto free_config;
sme_get_config_param(mac_handle, sme_config);
sme_config->csrConfig.channelBondingMode5GHz = bonding_mode;
sme_config->csrConfig.channelBondingMode24GHz = bonding_mode;
sme_config->csr_config.channelBondingMode5GHz = bonding_mode;
sme_config->csr_config.channelBondingMode24GHz = bonding_mode;
sme_update_config(mac_handle, sme_config);
free_config:
@ -7264,11 +7266,11 @@ static int __iw_get_char_setnone(struct net_device *dev,
sme_get_config_param(mac_handle, sme_config);
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
sme_config->csrConfig.channelBondingMode24GHz)
sme_config->csr_config.channelBondingMode24GHz)
ch_bond24 = true;
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
sme_config->csrConfig.channelBondingMode5GHz)
sme_config->csr_config.channelBondingMode5GHz)
ch_bond5g = true;
qdf_mem_free(sme_config);

2
core/sme/inc/sme_api.h
View file

@ -132,7 +132,7 @@
Type declarations
------------------------------------------------------------------------*/
struct sme_config_params {
struct csr_config_params csrConfig;
struct csr_config_params csr_config;
};
#ifdef FEATURE_WLAN_TDLS

14
core/sme/src/common/sme_api.c
View file

@ -800,7 +800,7 @@ QDF_STATUS sme_set11dinfo(mac_handle_t mac_handle,
return status;
}
status = csr_set_channels(mac_ctx, &pSmeConfigParams->csrConfig);
status = csr_set_channels(mac_ctx, &pSmeConfigParams->csr_config);
if (!QDF_IS_STATUS_SUCCESS(status))
sme_err("csr_set_channels failed with status: %d", status);
@ -908,9 +908,9 @@ QDF_STATUS sme_update_config(mac_handle_t mac_handle,
sme_err("SME config params empty");
return status;
}
sme_update_neighbor_report_config(mac, &pSmeConfigParams->csrConfig);
sme_update_neighbor_report_config(mac, &pSmeConfigParams->csr_config);
status = csr_change_default_config_param(mac, &pSmeConfigParams->
csrConfig);
csr_config);
if (!QDF_IS_STATUS_SUCCESS(status))
sme_err("csr_change_default_config_param failed status: %d",
@ -3237,7 +3237,7 @@ QDF_STATUS sme_get_config_param(mac_handle_t mac_handle,
TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0));
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
status = csr_get_config_param(mac, &pParam->csrConfig);
status = csr_get_config_param(mac, &pParam->csr_config);
if (status != QDF_STATUS_SUCCESS) {
sme_err("csr_get_config_param failed");
sme_release_global_lock(&mac->sme);
@ -13187,11 +13187,11 @@ QDF_STATUS sme_update_sta_roam_policy(mac_handle_t mac_handle,
qdf_mem_zero(sme_config, sizeof(*sme_config));
sme_get_config_param(mac_handle, sme_config);
sme_config->csrConfig.sta_roam_policy_params.dfs_mode =
sme_config->csr_config.sta_roam_policy_params.dfs_mode =
dfs_mode;
sme_config->csrConfig.sta_roam_policy_params.skip_unsafe_channels =
sme_config->csr_config.sta_roam_policy_params.skip_unsafe_channels =
skip_unsafe_channels;
sme_config->csrConfig.sta_roam_policy_params.sap_operating_band =
sme_config->csr_config.sta_roam_policy_params.sap_operating_band =
sap_operating_band;
sme_update_config(mac_handle, sme_config);