samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename ini param name sap_restart_on_ch_avoid

Browse Source 
sap_restart_on_ch_avoid ini parameter holds good for both SAP and GO.
So to make it generic, rename to ignore_restart_on_chan_avoid_event.

Change-Id: Ic68014a71b36e00c268da50528bf5e14fd87d007
CRs-Fixed: 2027436
This commit is contained in:
Hanumanth Reddy Pothula
2017-07-04 11:32:44 +05:30
committed by snandini
parent be61cdab89
commit ffc2d4866e
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/hdd/inc/wlan_hdd_cfg.h
View File

@@ -8858,14 +8858,18 @@ enum dot11p_mode {
/*
* <ini>
* sap_restart_on_ch_avoid - control SAP restart on channel avoidance
* restart_beaconing_on_chan_avoid_event - control the beaconing entity to move
* away from active LTE channels
* @Min: 0
* @Max: 1
* @Default: 1
*
* This ini is used to control SAP restart on channel avoidance
* sap_restart_on_ch_avoid=0: Don't restart SAP on channel avoidance indication
* sap_restart_on_ch_avoid=1: restart SAP on channel avoidance indication
* This ini is used to control the beaconing entity (SAP/GO) to move away from
* active LTE channels when channel avoidance event is received
* restart_beaconing_on_chan_avoid_event=0: Don't allow beaconing entity move
* from active LTE channels
* restart_beaconing_on_chan_avoid_event=1: Allow beaconing entity move from
* active LTE channels
*
* Related: None
*
@@ -8875,10 +8879,10 @@ enum dot11p_mode {
*
* </ini>
*/
#define CFG_SAP_RESTART_ON_CH_AVOID_NAME "sap_restart_on_ch_avoid"
#define CFG_SAP_RESTART_ON_CH_AVOID_MIN (0)
#define CFG_SAP_RESTART_ON_CH_AVOID_MAX (1)
#define CFG_SAP_RESTART_ON_CH_AVOID_DEFAULT (1)
#define CFG_RESTART_BEACONING_ON_CH_AVOID_NAME "restart_beaconing_on_chan_avoid_event"
#define CFG_RESTART_BEACONING_ON_CH_AVOID_MIN (0)
#define CFG_RESTART_BEACONING_ON_CH_AVOID_MAX (1)
#define CFG_RESTART_BEACONING_ON_CH_AVOID_DEFAULT (1)
/*
* This parameter will avoid updating ap_sta_inactivity from hostapd.conf
* file. If a station does not send anything in ap_max_inactivity seconds, an
@@ -11277,7 +11281,7 @@ struct hdd_config {
enum hdd_wext_control standard_wext_control;
enum hdd_wext_control private_wext_control;
bool sap_internal_restart;
bool sap_restart_on_ch_avoid;
bool restart_beaconing_on_chan_avoid_event;
uint8_t is_per_roam_enabled;
uint32_t per_roam_high_rate_threshold;
uint32_t per_roam_low_rate_threshold;

14
core/hdd/src/wlan_hdd_cfg.c
View File

@@ -4259,12 +4259,12 @@ struct reg_table_entry g_registry_table[] = {
CFG_SAP_INTERNAL_RESTART_MIN,
CFG_SAP_INTERNAL_RESTART_MAX),
REG_VARIABLE(CFG_SAP_RESTART_ON_CH_AVOID_NAME, WLAN_PARAM_Integer,
struct hdd_config, sap_restart_on_ch_avoid,
REG_VARIABLE(CFG_RESTART_BEACONING_ON_CH_AVOID_NAME, WLAN_PARAM_Integer,
struct hdd_config, restart_beaconing_on_chan_avoid_event,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
CFG_SAP_RESTART_ON_CH_AVOID_DEFAULT,
CFG_SAP_RESTART_ON_CH_AVOID_MIN,
CFG_SAP_RESTART_ON_CH_AVOID_MAX),
CFG_RESTART_BEACONING_ON_CH_AVOID_DEFAULT,
CFG_RESTART_BEACONING_ON_CH_AVOID_MIN,
CFG_RESTART_BEACONING_ON_CH_AVOID_MAX),
REG_VARIABLE(CFG_PER_ROAM_ENABLE_NAME, WLAN_PARAM_Integer,
struct hdd_config, is_per_roam_enabled,
@@ -6028,8 +6028,8 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
CFG_AUTO_DETECT_POWER_FAIL_MODE_NAME,
pHddCtx->config->auto_pwr_save_fail_mode);
hdd_debug("Name = [%s] Value = [%d]",
CFG_SAP_RESTART_ON_CH_AVOID_NAME,
pHddCtx->config->sap_restart_on_ch_avoid);
CFG_RESTART_BEACONING_ON_CH_AVOID_NAME,
pHddCtx->config->restart_beaconing_on_chan_avoid_event);
hdd_per_roam_print_ini_config(pHddCtx);
hdd_he_print_ini_config(pHddCtx);

2
core/hdd/src/wlan_hdd_main.c
View File

@@ -7134,7 +7134,7 @@ void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
* first update the unsafe channel list to the platform driver and
* send the avoid freq event to the application
*/
if (hdd_ctxt->config->sap_restart_on_ch_avoid) {
if (hdd_ctxt->config->restart_beaconing_on_chan_avoid_event) {
wlan_hdd_send_avoid_freq_event(hdd_ctxt, &hdd_avoid_freq_list);
if (!hdd_ctxt->unsafe_channel_count) {