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

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

Merge 8e8bcdca on remote branch 

Change-Id: I941a9852e5f3fa21e397afe8d30efee975840f6b
parents 5a4a0fc1 8e8bcdca

umac/scan/core/src/wlan_scan_cache_db.c

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

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 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
@@ -132,7 +133,7 @@ static void scm_add_rnr_channel_db(struct wlan_objmgr_psoc *psoc, 
			continue;

		chan_freq = wlan_reg_chan_opclass_to_freq(rnr_bss->channel_number,

							  rnr_bss->operating_class,

							  false);

							  true);

		channel = scm_get_chan_meta(psoc, chan_freq);

		if (!channel) {

			scm_debug("Failed to get chan Meta freq %d", chan_freq);

wmi/src/wmi_unified_tlv.c

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

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

 * Copyright (c) 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
@@ -10695,7 +10696,6 @@ static QDF_STATUS extract_profile_data_tlv(wmi_unified_t wmi_handle, 
{

	WMI_WLAN_PROFILE_DATA_EVENTID_param_tlvs *param_buf;

	wmi_wlan_profile_t *ev;

	uint8_t *buf_ptr;



	param_buf = (WMI_WLAN_PROFILE_DATA_EVENTID_param_tlvs *)evt_buf;

	if (!param_buf) {
@@ -10703,12 +10703,7 @@ static QDF_STATUS extract_profile_data_tlv(wmi_unified_t wmi_handle, 
		return QDF_STATUS_E_INVAL;

	}



	buf_ptr = (uint8_t *)param_buf->profile_ctx;

	buf_ptr = buf_ptr + sizeof(wmi_wlan_profile_ctx_t) + WMI_TLV_HDR_SIZE;



	buf_ptr = buf_ptr + (sizeof(wmi_wlan_profile_t) * idx);

	ev = (wmi_wlan_profile_t *)buf_ptr;



	ev = &param_buf->profile_data[idx];

	profile_data->id  = ev->id;

	profile_data->cnt = ev->cnt;

	profile_data->tot = ev->tot;