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

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

Merge aac91c68 on remote branch 

Change-Id: I63781d358e93acbf512cdcdbb46131c4f288bd5f
parents 4d5071c8 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);

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

+1 −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

core/hdd/src/wlan_hdd_sar_limits.c

+34 −29
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.

 *

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

 * any purpose with or without fee is hereby granted, provided that the
@@ -993,14 +994,29 @@ static void hdd_send_sar_unsolicited_event(struct hdd_context *hdd_ctx) 
	cfg80211_vendor_event(vendor_event, GFP_KERNEL);

}



static void hdd_sar_unsolicited_timer_cb(void *user_data)

static void hdd_sar_unsolicited_work_cb(void *user_data)

{

	struct hdd_context *hdd_ctx = (struct hdd_context *)user_data;

	uint8_t i = 0;

	QDF_STATUS status;

	int errno;

	struct osif_psoc_sync *psoc_sync;



	hdd_nofl_debug("Sar unsolicited timer expired");



	errno = osif_psoc_sync_op_start(wiphy_dev(hdd_ctx->wiphy), &psoc_sync);



	if (errno == -EAGAIN) {

		hdd_nofl_debug("rescheduling sar unsolicited work");

		qdf_delayed_work_start(&hdd_ctx->sar_safety_unsolicited_work,

			hdd_ctx->config->sar_safety_unsolicited_timeout);



		return;

	} else if (errno) {

		hdd_err("cannot handle sar unsolicited work");

		return;

	}



	qdf_atomic_set(&hdd_ctx->sar_safety_req_resp_event_in_progress, 1);



	for (i = 0; i < hdd_ctx->config->sar_safety_req_resp_retry; i++) {
@@ -1017,6 +1033,8 @@ static void hdd_sar_unsolicited_timer_cb(void *user_data) 
	if (i >= hdd_ctx->config->sar_safety_req_resp_retry)

		hdd_configure_sar_index(hdd_ctx,

					hdd_ctx->config->sar_safety_index);



	osif_psoc_sync_op_stop(psoc_sync);

}



static void hdd_sar_safety_timer_cb(void *user_data)
@@ -1029,8 +1047,6 @@ static void hdd_sar_safety_timer_cb(void *user_data) 


void wlan_hdd_sar_unsolicited_timer_start(struct hdd_context *hdd_ctx)

{

	QDF_STATUS status;



	if (!hdd_ctx->config->enable_sar_safety)

		return;
@@ -1038,16 +1054,10 @@ void wlan_hdd_sar_unsolicited_timer_start(struct hdd_context *hdd_ctx) 
			&hdd_ctx->sar_safety_req_resp_event_in_progress) > 0)

		return;



	if (QDF_TIMER_STATE_RUNNING !=

		qdf_mc_timer_get_current_state(

				&hdd_ctx->sar_safety_unsolicited_timer)) {

		status = qdf_mc_timer_start(

			&hdd_ctx->sar_safety_unsolicited_timer,

	qdf_delayed_work_start(&hdd_ctx->sar_safety_unsolicited_work,

			       hdd_ctx->config->sar_safety_unsolicited_timeout);



		if (QDF_IS_STATUS_SUCCESS(status))

			hdd_nofl_debug("sar unsolicited timer started");

	}

	hdd_nofl_debug("sar safety unsolicited work started");

}



void wlan_hdd_sar_timers_reset(struct hdd_context *hdd_ctx)
@@ -1072,20 +1082,16 @@ void wlan_hdd_sar_timers_reset(struct hdd_context *hdd_ctx) 
	if (QDF_IS_STATUS_SUCCESS(status))

		hdd_nofl_debug("sar safety timer started");



	if (QDF_TIMER_STATE_RUNNING ==

		qdf_mc_timer_get_current_state(

				&hdd_ctx->sar_safety_unsolicited_timer)) {

		status = qdf_mc_timer_stop(

				&hdd_ctx->sar_safety_unsolicited_timer);

		if (QDF_IS_STATUS_SUCCESS(status))

			hdd_nofl_debug("sar unsolicited timer stopped");

	}

	qdf_delayed_work_stop_sync(&hdd_ctx->sar_safety_unsolicited_work);

	hdd_nofl_debug("sar safety unsolicited work stopped");



	qdf_event_set(&hdd_ctx->sar_safety_req_resp_event);

}



void wlan_hdd_sar_timers_init(struct hdd_context *hdd_ctx)

{

	QDF_STATUS status;



	if (!hdd_ctx->config->enable_sar_safety)

		return;
@@ -1094,9 +1100,13 @@ void wlan_hdd_sar_timers_init(struct hdd_context *hdd_ctx) 
	qdf_mc_timer_init(&hdd_ctx->sar_safety_timer, QDF_TIMER_TYPE_SW,

			  hdd_sar_safety_timer_cb, hdd_ctx);



	qdf_mc_timer_init(&hdd_ctx->sar_safety_unsolicited_timer,

			  QDF_TIMER_TYPE_SW,

			  hdd_sar_unsolicited_timer_cb, hdd_ctx);

	status = qdf_delayed_work_create(&hdd_ctx->sar_safety_unsolicited_work,

					 hdd_sar_unsolicited_work_cb,

					 hdd_ctx);

	if (QDF_IS_STATUS_ERROR(status)) {

		hdd_err("failed to create sar safety unsolicited work");

		return;

	}



	qdf_atomic_init(&hdd_ctx->sar_safety_req_resp_event_in_progress);

	qdf_event_create(&hdd_ctx->sar_safety_req_resp_event);
@@ -1117,12 +1127,7 @@ void wlan_hdd_sar_timers_deinit(struct hdd_context *hdd_ctx) 


	qdf_mc_timer_destroy(&hdd_ctx->sar_safety_timer);



	if (QDF_TIMER_STATE_RUNNING ==

		qdf_mc_timer_get_current_state(

				&hdd_ctx->sar_safety_unsolicited_timer))

		qdf_mc_timer_stop(&hdd_ctx->sar_safety_unsolicited_timer);



	qdf_mc_timer_destroy(&hdd_ctx->sar_safety_unsolicited_timer);

	qdf_delayed_work_destroy(&hdd_ctx->sar_safety_unsolicited_work);



	qdf_event_destroy(&hdd_ctx->sar_safety_req_resp_event);

core/hdd/src/wlan_hdd_stats.c

+6 −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
@@ -2140,6 +2140,11 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, 
		return -EINVAL;

	}



	if (adapter->device_mode == QDF_SAP_MODE) {

		hdd_nofl_debug("LL_STATS get is not supported for SAP mode");

		return -EINVAL;

	}



	if (hddstactx->hdd_reassoc_scenario) {

		hdd_err("Roaming in progress, cannot process the request");

		return -EBUSY;