diff options
| -rw-r--r-- | core/cds/inc/cds_config.h | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 2 | ||||
| -rw-r--r-- | core/wma/src/wma_dev_if.c | 6 | ||||
| -rw-r--r-- | core/wma/src/wma_main.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/core/cds/inc/cds_config.h b/core/cds/inc/cds_config.h index 96b5763cc736..33bb3b73a721 100644 --- a/core/cds/inc/cds_config.h +++ b/core/cds/inc/cds_config.h @@ -150,6 +150,7 @@ enum cds_auto_pwr_detect_failure_mode_t { * @active_mc_bc_apf_mode: Setting that determines how APF is applied in * active mode for MC/BC packets * @rps_enabled: RPS enabled in SAP mode + * @delay_before_vdev_stop: wait time for tx complete before vdev stop * @ito_repeat_count: Indicates ito repeated count * @bandcapability: Configured band by user * @etsi_srd_chan_in_master_mode: Use of ETSI SRD chan in SAP/P2P-GO ACS/PCL @@ -214,6 +215,7 @@ struct cds_config_info { enum active_apf_mode active_uc_apf_mode; enum active_apf_mode active_mc_bc_apf_mode; bool rps_enabled; + uint8_t delay_before_vdev_stop; enum cds_auto_pwr_detect_failure_mode_t auto_power_save_fail_mode; uint8_t ito_repeat_count; uint8_t bandcapability; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 1459e48b916f..63957aa89356 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9408,6 +9408,8 @@ static int hdd_update_cds_config(hdd_context_t *hdd_ctx) cds_cfg->ito_repeat_count = hdd_ctx->config->ito_repeat_count; cds_cfg->bandcapability = hdd_ctx->config->nBandCapability; + cds_cfg->delay_before_vdev_stop = + hdd_ctx->config->delay_before_vdev_stop; hdd_ra_populate_cds_config(cds_cfg, hdd_ctx); hdd_txrx_populate_cds_config(cds_cfg, hdd_ctx); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index b1e7034c9456..3fe9ffd96749 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -5359,7 +5359,6 @@ fail_del_bss_ho_fail: WMA_DELETE_BSS_HO_FAIL_RSP, (void *)params, 0); } -#ifdef WLAN_FEATURE_HOST_ROAM /** * wma_wait_tx_complete() - Wait till tx packets are drained * @wma: wma handle @@ -5396,12 +5395,7 @@ static void wma_wait_tx_complete(tp_wma_handle wma, max_wait_iterations--; } } -#else -static void wma_wait_tx_complete(tp_wma_handle wma) -{ -} -#endif /** * wma_delete_bss() - process delete bss request from upper layer * @wma: wma handle diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index e1dfe94532ca..1cc0f1b609a8 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -2635,9 +2635,11 @@ QDF_STATUS wma_open(void *cds_context, goto err_scn_context; } - for (i = 0; i < wma_handle->max_bssid; ++i) + for (i = 0; i < wma_handle->max_bssid; ++i) { wma_vdev_init(&wma_handle->interfaces[i]); - + wma_handle->interfaces[i].delay_before_vdev_stop = + cds_cfg->delay_before_vdev_stop; + } /* Register the debug print event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DEBUG_PRINT_EVENTID, |