diff options
| author | Amar Singhal <asinghal@codeaurora.org> | 2016-01-22 10:42:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-17 18:05:45 -0700 |
| commit | 2299511d9f2af144076ed9663f2080962b796aef (patch) | |
| tree | f9f3bb2e67fd560749207c6d505fdd28651ad495 /core/mac/src | |
| parent | 3b6068c457cf69f12aea80ee3ec5c271cc75df57 (diff) | |
qcacld-3.0: Make regdomain code linux style
Fix the data structures of regdomain code; to make it linux style.
Change-Id: If8123370f4ce370adba1a49636b42449c2644144
CRs-Fixed: 961806
Diffstat (limited to 'core/mac/src')
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_sme_req_messages.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_process_tdls.c | 4 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_messages.c | 8 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 4 | ||||
| -rw-r--r-- | core/mac/src/sys/legacy/src/utils/src/parser_api.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index c0bab96447f7..3c605798497f 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -5544,7 +5544,7 @@ static void send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, tpDphHashNode psta; - op_class = cds_regdm_get_opclass_from_channel( + op_class = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, new_channel, ch_bandwidth); @@ -5591,7 +5591,7 @@ static void lim_process_sme_dfs_csa_ie_request(tpAniSirGlobal mac_ctx, tpPESession session_entry = NULL; uint8_t session_id; tLimWiderBWChannelSwitchInfo *wider_bw_ch_switch; - offset_t ch_offset; + enum offset_t ch_offset; if (msg_buf == NULL) { lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 5bf81e6c9cb7..f524a28f2b22 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2610,7 +2610,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, } - op_class = cds_regdm_get_opclass_from_channel( + op_class = cds_reg_dmn_get_opclass_from_channel( pMac->scan.countryCodeCurrent, psessionEntry->currentOperChannel, chanOffset); @@ -2635,7 +2635,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, suppOperClasses->present = 1; suppOperClasses->classes[0] = op_class; - cds_regdm_get_curr_opclasses(&numClasses, &classes[0]); + cds_reg_dmn_get_curr_opclasses(&numClasses, &classes[0]); for (i = 0; i < numClasses; i++) { suppOperClasses->classes[i + 1] = classes[i]; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 574116591fdd..c990d54dbe4a 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -880,10 +880,10 @@ tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx, ht40_obss_scanind->obss_activity_threshold = session->obss_ht40_scanparam.obss_activity_threshold; ht40_obss_scanind->current_operatingclass = - cds_regdm_get_opclass_from_channel( - mac_ctx->scan.countryCodeCurrent, - session->currentOperChannel, - session->ch_width); + cds_reg_dmn_get_opclass_from_channel( + mac_ctx->scan.countryCodeCurrent, + session->currentOperChannel, + session->ch_width); channelnum = WNI_CFG_VALID_CHANNEL_LIST_LEN; if (wlan_cfg_get_str(mac_ctx, WNI_CFG_VALID_CHANNEL_LIST, chan_list, &channelnum) != eSIR_SUCCESS) { diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 17d44927d859..590d8eba74b3 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2106,7 +2106,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } else if (csa_params->ies_present_flag & lim_xcsa_ie_present) { chan_space = - cds_regdm_get_chanwidth_from_opclass( + cds_reg_dmn_get_chanwidth_from_opclass( mac_ctx->scan.countryCodeCurrent, csa_params->channel, csa_params->new_op_class); @@ -2157,7 +2157,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) if (csa_params->ies_present_flag & lim_xcsa_ie_present) { chan_space = - cds_regdm_get_chanwidth_from_opclass( + cds_reg_dmn_get_chanwidth_from_opclass( mac_ctx->scan.countryCodeCurrent, csa_params->channel, csa_params->new_op_class); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 80c7a66a2ab0..b41e6163ed56 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -256,7 +256,7 @@ void populate_dot_11_f_ext_chann_switch_ann(tpAniSirGlobal mac_ptr, ch_offset = session_entry->gLimChannelSwitch.sec_ch_offset; dot_11_ptr->switch_mode = session_entry->gLimChannelSwitch.switchMode; - dot_11_ptr->new_reg_class = cds_regdm_get_opclass_from_channel( + dot_11_ptr->new_reg_class = cds_reg_dmn_get_opclass_from_channel( mac_ptr->scan.countryCodeCurrent, session_entry->gLimChannelSwitch.primaryChannel, ch_offset); @@ -320,9 +320,9 @@ populate_dot11_supp_operating_classes(tpAniSirGlobal mac_ptr, } } - cds_regdm_get_curr_opclasses(&dot_11_ptr->num_classes, + cds_reg_dmn_get_curr_opclasses(&dot_11_ptr->num_classes, &dot_11_ptr->classes[1]); - dot_11_ptr->classes[0] = cds_regdm_get_opclass_from_channel( + dot_11_ptr->classes[0] = cds_reg_dmn_get_opclass_from_channel( mac_ptr->scan.countryCodeCurrent, session_entry->currentOperChannel, ch_bandwidth); |
