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

Commit 3c514b6b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 8c1cbba9 on remote branch 

Change-Id: I856e994cabcdb6951c5649d8e3cb2fb0398ea5d6
parents 69af6311 8c1cbba9

Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -2664,7 +2664,6 @@ cppflags-$(CONFIG_FEATURE_MOTION_DETECTION) += -DWLAN_FEATURE_MOTION_DETECTION 
cppflags-$(CONFIG_WLAN_FW_OFFLOAD) += -DWLAN_FW_OFFLOAD

cppflags-$(CONFIG_WLAN_FEATURE_ELNA) += -DWLAN_FEATURE_ELNA

cppflags-$(CONFIG_FEATURE_COEX) += -DFEATURE_COEX

cppflags-y += -DROAM_OFFLOAD_V1

cppflags-$(CONFIG_INTERFACE_MGR) += -DWLAN_FEATURE_INTERFACE_MGR

cppflags-$(CONFIG_HOST_WAKEUP_OVER_QMI) += -DHOST_WAKEUP_OVER_QMI

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ CFG_INI_UINT("gDualMacFeatureDisable", 0, 6, 6, CFG_VALUE_OR_DEFAULT, \ 
 * support disabled, the value is defined by enum PM_AP_DFS_MASTER_MODE.

 * 0 - Disallow STA+SAP SCC on DFS channel

 * 1 - Allow STA+SAP SCC on DFS channel with master mode disabled

 *       This needs gEnableDFSMasterCap enabled to allow SAP SCC with

 *       STA on DFS but dfs master mode disabled. Single SAP is not allowed

 *       on DFS.

 * 2 - enhance "1" with below requirement

 *	 a. Allow single SAP (GO) start on DFS channel.

 *	 b. Allow CAC process on DFS channel in single SAP (GO) mode

components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static QDF_STATUS policy_mgr_init_cfg(struct wlan_objmgr_psoc *psoc) 
	 */

	if (cfg->sta_sap_scc_on_dfs_chnl == 2 &&

	    !cfg_get(psoc, CFG_ENABLE_DFS_MASTER_CAPABILITY))

		cfg->sta_sap_scc_on_dfs_chnl = 1;

		cfg->sta_sap_scc_on_dfs_chnl = 0;

	cfg->nan_sap_scc_on_lte_coex_chnl =

		cfg_get(psoc, CFG_NAN_SAP_SCC_ON_LTE_COEX_CHAN);

	cfg->sta_sap_scc_on_lte_coex_chnl =

components/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ enum txrate_gi { 
 * @pno_match_wake_up_count:    pno match wakeup count

 * @oem_response_wake_up_count: oem response wakeup count

 * @uc_drop_wake_up_count:      local data uc drop wakeup count

 * @fatal_event_wake_up_count:  fatal event wakeup count

 * @pwr_save_fail_detected:     pwr save fail detected wakeup count

 * @scan_11d                    11d scan wakeup count

 * @mgmt_assoc: association request management frame
@@ -162,6 +163,7 @@ struct wake_lock_stats { 
	uint32_t pno_match_wake_up_count;

	uint32_t oem_response_wake_up_count;

	uint32_t uc_drop_wake_up_count;

	uint32_t fatal_event_wake_up_count;

	uint32_t pwr_save_fail_detected;

	uint32_t scan_11d;

	uint32_t mgmt_assoc;

components/cp_stats/dispatcher/src/wlan_cp_stats_mc_ucfg_api.c

+4 −0
Original line number Diff line number Diff line
@@ -552,6 +552,8 @@ static void vdev_iterator(struct wlan_objmgr_psoc *psoc, void *vdev, void *arg) 
	stats->oem_response_wake_up_count +=

			vdev_stats->oem_response_wake_up_count;

	stats->uc_drop_wake_up_count += vdev_stats->uc_drop_wake_up_count;

	stats->fatal_event_wake_up_count +=

			vdev_stats->fatal_event_wake_up_count;

	stats->pwr_save_fail_detected += vdev_stats->pwr_save_fail_detected;

	stats->scan_11d += vdev_stats->scan_11d;

}
@@ -663,6 +665,7 @@ QDF_STATUS ucfg_mc_cp_stats_write_wow_stats( 
			     "\tPNO Complete: %u\n"

			     "\tPNO Match: %u\n"

			     "\tUC Drop wake_count: %u\n"

			     "\twake count due to fatal event: %u\n"

			     "\tOEM rsp wake_count: %u\n"

			     "\twake count due to pwr_save_fail_detected: %u\n"

			     "\twake count due to 11d scan: %u\n",
@@ -682,6 +685,7 @@ QDF_STATUS ucfg_mc_cp_stats_write_wow_stats( 
			     wow_stats.pno_complete_wake_up_count,

			     wow_stats.pno_match_wake_up_count,

			     wow_stats.uc_drop_wake_up_count,

			     wow_stats.fatal_event_wake_up_count,

			     wow_stats.oem_response_wake_up_count,

			     wow_stats.pwr_save_fail_detected,

			     wow_stats.scan_11d);