diff options
| author | Lokesh Chouhan <c_lchouh@qti.qualcomm.com> | 2015-09-22 12:10:12 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-10-16 12:36:37 +0530 |
| commit | 5b9df45db0a4f862bb71f1a9625a99422ef55e98 (patch) | |
| tree | 6bf56ce117468c16873e3f98f1ce0eb8019ca93a | |
| parent | c81a8f207f8b452fdfcb0d34129db7ce708ee670 (diff) | |
qcacld-2.0: Prefer ini params logging preference over code preference
Previously trace logging levels are set from cfg.ini for different
modules which again over written by code. Ultimately code logging
preference was taking place.
After changes if the log level for any module is set to DEFAULT(0xffff)
then only code logging preference will be used else cfg.ini logging will be
preferred.
CRs-Fixed: 875973
Change-Id: Ia3df86908cec1d5c487d614a418721c0cd98fc52
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 0a18a5b64634..1e8ef759d7a9 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -12034,7 +12034,16 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) for (i = 0; i < MAX_MOD_LOGLEVEL; i++) { pHddCtx->fw_log_settings.dl_mod_loglevel[i] = 0; } - // Update VOS trace levels based upon the cfg.ini + + /* + * Update VOS trace levels based upon the code + */ + if (pHddCtx->cfg_ini->multicast_host_fw_msgs) + wlan_logging_set_log_level(); + + /* + * Update VOS trace levels based upon the cfg.ini + */ hdd_vos_trace_enable(VOS_MODULE_ID_TL, pHddCtx->cfg_ini->vosTraceEnableTL); hdd_vos_trace_enable(VOS_MODULE_ID_WDI, @@ -12533,9 +12542,6 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) } } #endif - if (vos_is_multicast_logging()) - wlan_logging_set_log_level(); - hdd_register_mcast_bcast_filter(pHddCtx); if (VOS_STA_SAP_MODE != hdd_get_conparam()) { |