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

Unverified Commit 775439a3 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-20700-LAHAINA.QSSI13.0' of... 

Merge tag 'LA.UM.9.14.r1-20700-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn into android13-5.4-lahaina

"LA.UM.9.14.r1-20700-LAHAINA.QSSI13.0"

* tag 'LA.UM.9.14.r1-20700-LAHAINA.QSSI13.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:
  qcacmn: Fix FTM rx frames capture in packet capture mode
  qcacmn: Handle gracefully if scheduler cb is not registered

Change-Id: I2380529ffb1e526a376e8c17a116b8388ecea77f
parents fd6c2819 2271aebf

drivers/staging/qca-wifi-host-cmn/scheduler/src/scheduler_api.c

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

 * Copyright (c) 2014-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

 * above copyright notice and this permission notice appear in all
@@ -288,7 +288,7 @@ QDF_STATUS scheduler_post_msg_by_priority(uint32_t qid, 
	}



	if (!sched_ctx->queue_ctx.scheduler_msg_process_fn[qidx]) {

		QDF_DEBUG_PANIC("callback not registered for qid[%d]", que_id);

		sched_err("callback not registered for qid[%d]", que_id);

		return QDF_STATUS_E_FAILURE;

	}

drivers/staging/qca-wifi-host-cmn/umac/cmn_services/mgmt_txrx/dispatcher/inc/wlan_mgmt_txrx_utils_api.h

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ enum block_ack_actioncode { 


/**

 * enum pub_actioncode - public action frames

 * Reference IEEE Std 802.11-2020 Table 9-364—Public Action field values

 * @PUB_ACTION_2040_BSS_COEXISTENCE:  public 20-40 bss coex action frame

 * @PUB_ACTION_EXT_CHANNEL_SWITCH_ID: public ext channel switch id action frame

 * @PUB_ACTION_VENDOR_SPECIFIC: vendor specific public action frame
@@ -214,6 +215,8 @@ enum block_ack_actioncode { 
 * @PUB_ACTION_GAS_COMEBACK_REQUEST: GAS comeback request action frame

 * @PUB_ACTION_GAS_COMEBACK_RESPONSE: GAS comeback respose action frame

 * @PUB_ACTION_TDLS_DISCRESP: tdls discovery response public action frame

 * @PUB_ACTION_FTM_REQUEST: FTM request action frame

 * @PUB_ACTION_FTM_RESPONSE: FTM respose action frame

 */

enum pub_actioncode {

	PUB_ACTION_2040_BSS_COEXISTENCE = 0,
@@ -224,6 +227,8 @@ enum pub_actioncode { 
	PUB_ACTION_GAS_COMEBACK_REQUEST = 12,

	PUB_ACTION_GAS_COMEBACK_RESPONSE = 13,

	PUB_ACTION_TDLS_DISCRESP = 14,

	PUB_ACTION_FTM_REQUEST = 32,

	PUB_ACTION_FTM_RESPONSE = 33,

};



/**
@@ -617,6 +622,8 @@ struct action_frm_hdr { 
 * @MGMT_ACTION_TWT_SETUP: TWT setup frame

 * @MGMT_ACTION_TWT_TEARDOWN: TWT teardown frame

 * @MGMT_ACTION_TWT_INFORMATION: TWT information frame

 * @MGMT_ACTION_FTM_REQUEST: FTM request frame

 * @MGMT_ACTION_FTM_RESPONSE: FTM response frame

 * @MGMT_MAX_FRAME_TYPE:         max. mgmt frame types

 */

enum mgmt_frame_type {
@@ -745,6 +752,8 @@ enum mgmt_frame_type { 
	MGMT_ACTION_TWT_SETUP,

	MGMT_ACTION_TWT_TEARDOWN,

	MGMT_ACTION_TWT_INFORMATION,

	MGMT_ACTION_FTM_REQUEST,

	MGMT_ACTION_FTM_RESPONSE,

	MGMT_MAX_FRAME_TYPE,

};

drivers/staging/qca-wifi-host-cmn/umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c

+6 −0
Original line number Diff line number Diff line
@@ -210,6 +210,12 @@ mgmt_get_public_action_subtype(uint8_t action_code) 
	case PUB_ACTION_GAS_COMEBACK_RESPONSE:

		frm_type = MGMT_ACTION_GAS_COMEBACK_RESPONSE;

		break;

	case PUB_ACTION_FTM_REQUEST:

		frm_type = MGMT_ACTION_FTM_REQUEST;

		break;

	case PUB_ACTION_FTM_RESPONSE:

		frm_type = MGMT_ACTION_FTM_RESPONSE;

		break;

	default:

		frm_type = MGMT_FRM_UNSPECIFIED;

		break;