Merge 661af9cfb5 on remote branch

Change-Id: I2da540ac731d025ccbb3ba984739eef865d4d855
This commit is contained in:
Linux Build Service Account 2022-10-07 03:11:08 -07:00
commit 2271aebf87
3 changed files with 17 additions and 2 deletions

View file

@ -1,6 +1,6 @@
/*
* 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;
}

View file

@ -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,
};

View file

@ -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;