qcacld-3.0: Cleanup instances of CFG_COUNTRY_CODE
Remove instances of CFG_COUNTRY_CODE and country_code from wlan_mlme_reg struct. Remove redundant country code APIs. This change is needed because the country code is no longer stored in CFG file, and subsequently, there is no need for CFG_COUNTRY_CODE. Change-Id: Ia4b3b40d0dccfde696352967f2902dfba344a445 CRs-Fixed: 2634079
此提交包含在:
@@ -226,22 +226,6 @@
|
||||
VALID_CHANNEL_LIST_DEFAULT, \
|
||||
"valid channel list")
|
||||
|
||||
/*
|
||||
* country_code - Set country code
|
||||
* @Default: NA
|
||||
*
|
||||
* This ini is used to set country code
|
||||
*
|
||||
* Usage: Internal
|
||||
*
|
||||
*/
|
||||
#define CFG_COUNTRY_CODE CFG_STRING( \
|
||||
"country_code", \
|
||||
0, \
|
||||
CFG_COUNTRY_CODE_LEN, \
|
||||
"", \
|
||||
"country code")
|
||||
|
||||
/*
|
||||
* <ini>
|
||||
* ignore_fw_reg_offload_ind - If set, Ignore the FW offload indication
|
||||
@@ -297,7 +281,6 @@
|
||||
CFG(CFG_INDOOR_CHANNEL_SUPPORT) \
|
||||
CFG(CFG_SCAN_11D_INTERVAL) \
|
||||
CFG(CFG_VALID_CHANNEL_LIST) \
|
||||
CFG(CFG_COUNTRY_CODE) \
|
||||
CFG(CFG_IGNORE_FW_REG_OFFLOAD_IND) \
|
||||
CFG_SAP_AVOID_ACS_FREQ_LIST_ALL
|
||||
|
||||
|
@@ -2203,8 +2203,6 @@ struct wlan_mlme_mwc {
|
||||
* @scan_11d_interval: scan 11d interval
|
||||
* @valid_channel_freq_list: array for valid channel list
|
||||
* @valid_channel_list_num: valid channel list number
|
||||
* @country_code: country code
|
||||
* @country_code_len: country code length
|
||||
* @enable_11d_in_world_mode: Whether to enable 11d scan in world mode or not
|
||||
* @avoid_acs_freq_list: List of the frequencies which need to be avoided
|
||||
* during acs
|
||||
@@ -2222,8 +2220,6 @@ struct wlan_mlme_reg {
|
||||
uint32_t scan_11d_interval;
|
||||
uint32_t valid_channel_freq_list[CFG_VALID_CHANNEL_LIST_LEN];
|
||||
uint32_t valid_channel_list_num;
|
||||
uint8_t country_code[CFG_COUNTRY_CODE_LEN + 1];
|
||||
uint8_t country_code_len;
|
||||
bool enable_11d_in_world_mode;
|
||||
#ifdef SAP_AVOID_ACS_FREQ_LIST
|
||||
uint16_t avoid_acs_freq_list[CFG_VALID_CHANNEL_LIST_LEN];
|
||||
|
新增問題並參考
封鎖使用者