Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 182b6acd authored by Chouhan Lokesh's avatar Chouhan Lokesh Committed by Akash Patel
Browse files

qcacld-3.0: Prefer ini params logging preference over code preference 

qcacld-2.0 to qcacld-3.0 propogation

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
parent 84a65326

core/hdd/src/wlan_hdd_main.c

+10 −3
Original line number Diff line number Diff line
@@ -5081,7 +5081,16 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) 
	for (i = 0; i < MAX_MOD_LOGLEVEL; i++) {

		hdd_ctx->fw_log_settings.dl_mod_loglevel[i] = 0;

	}

	/* Update CDF trace levels based upon the cfg.ini */



	/*

	 * Update CDF trace levels based upon the code

	 */

	if (hdd_ctx->config->multicast_host_fw_msgs)

		wlan_logging_set_log_level();



	/*

	 * Update CDF trace levels based upon the cfg.ini

	 */

	hdd_cdf_trace_enable(CDF_MODULE_ID_WMI,

			     hdd_ctx->config->cdf_trace_enable_wdi);

	hdd_cdf_trace_enable(CDF_MODULE_ID_HDD,
@@ -5471,8 +5480,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) 
		}

	}

#endif

	if (cds_is_multicast_logging())

		wlan_logging_set_log_level();



	/*

	 * Action frame registered in one adapter which will