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

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

Merge aac91c68 on remote branch 

Change-Id: If3396f7a7e14d8600df214a8cb9570392f493fba
parents 4b5608c0 aac91c68

components/target_if/connection_mgr/src/target_if_cm_roam_offload.c

+2 −2
Original line number Diff line number Diff line
@@ -746,14 +746,14 @@ target_if_cm_roam_offload_11k_params(wmi_unified_t wmi_handle, 
	if (!wmi_service_enabled(wmi_handle,

				 wmi_service_11k_neighbour_report_support)) {

		target_if_err("FW doesn't support 11k offload");

		return QDF_STATUS_E_NOSUPPORT;

		return QDF_STATUS_SUCCESS;

	}



	/* If 11k enable command and ssid length is 0, drop it */

	if (req->offload_11k_bitmask &&

	    !req->neighbor_report_params.ssid.length) {

		target_if_debug("SSID Len 0");

		return QDF_STATUS_E_INVAL;

		return QDF_STATUS_SUCCESS;

	}



	status = wmi_unified_offload_11k_cmd(wmi_handle, req);

configs/wear_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -1232,3 +1232,6 @@ ifeq ($(CONFIG_FW_THERMAL_THROTTLE), y) 
CONFIG_WLAN_THERMAL_MULTI_CLIENT_SUPPORT := y

endif

endif



#Enable Low Power Modes: Deep Sleep/Hibernate

CONFIG_ENABLE_LOW_POWER_MODE := y

core/hdd/inc/wlan_hdd_main.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -2169,7 +2169,7 @@ struct hdd_context { 
	struct sar_limit_cmd_params *sar_cmd_params;

#ifdef SAR_SAFETY_FEATURE

	qdf_mc_timer_t sar_safety_timer;

	qdf_mc_timer_t sar_safety_unsolicited_timer;

	struct qdf_delayed_work sar_safety_unsolicited_work;

	qdf_event_t sar_safety_req_resp_event;

	qdf_atomic_t sar_safety_req_resp_event_in_progress;

#endif

core/hdd/src/wlan_hdd_main.c

+11 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -12262,6 +12262,16 @@ int hdd_psoc_idle_shutdown(struct device *dev) 
		return -EINVAL;

	}



	/*

	 * This is to handle scenario in which platform driver triggers

	 * idle_shutdown if Deep Sleep/Hibernate entry notification is

	 * received from modem subsystem in wearable devices

	 */

	if (hdd_is_any_interface_open(hdd_ctx)) {

		hdd_err_rl("all interfaces are not down, ignore idle shutdown");

		return -EINVAL;

	}



	if (is_mode_change_psoc_idle_shutdown)

		ret = __hdd_mode_change_psoc_idle_shutdown(hdd_ctx);

	else

core/hdd/src/wlan_hdd_power.c

+6 −2
Original line number Diff line number Diff line
@@ -2239,8 +2239,12 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, 
	}



	rc = wlan_hdd_validate_context(hdd_ctx);

	if (0 != rc)

	if (0 != rc) {

		if (pld_is_low_power_mode(hdd_ctx->parent_dev))

			hdd_debug("low power mode (Deep Sleep/Hibernate)");

		else

			return rc;

	}



	if (hdd_ctx->config->is_wow_disabled) {

		hdd_info_rl("wow is disabled");