Merge branch '1427devices-a14-FP4_vowifi' into 'a14' (2a268672) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/fw-api/fw/htt.h

+10 −19

Original line number	Original line	Diff line number	Diff line
	@@ -264,10 +264,9 @@
	* 3.134 Add qdata_refill flag in rx_peer_metadata_v1a.		* 3.134 Add qdata_refill flag in rx_peer_metadata_v1a.
	* 3.135 Add HTT_HOST4_TO_FW_RXBUF_RING def.		* 3.135 Add HTT_HOST4_TO_FW_RXBUF_RING def.
	* 3.136 Add htt_ext_present flag in htt_tx_tcl_global_seq_metadata.		* 3.136 Add htt_ext_present flag in htt_tx_tcl_global_seq_metadata.
	* 3.137 Add more HTT_SDWF_MSDUQ_CFG_IND_ERROR codes.
	*/		*/
	#define HTT_CURRENT_VERSION_MAJOR 3		#define HTT_CURRENT_VERSION_MAJOR 3
	#define HTT_CURRENT_VERSION_MINOR 137		#define HTT_CURRENT_VERSION_MINOR 136

	#define HTT_NUM_TX_FRAG_DESC 1024		#define HTT_NUM_TX_FRAG_DESC 1024

	@@ -834,11 +833,6 @@ typedef enum {
	HTT_STATS_TX_PDEV_WIFI_RADAR_TAG = 200, /* htt_stats_tx_pdev_wifi_radar_tlv */		HTT_STATS_TX_PDEV_WIFI_RADAR_TAG = 200, /* htt_stats_tx_pdev_wifi_radar_tlv */
	HTT_STATS_TXBF_OFDMA_BE_PARBW_TAG = 201, /* htt_stats_txbf_ofdma_be_parbw_tlv */		HTT_STATS_TXBF_OFDMA_BE_PARBW_TAG = 201, /* htt_stats_txbf_ofdma_be_parbw_tlv */
	HTT_STATS_RX_PDEV_RSSI_HIST_TAG = 202, /* htt_stats_rx_pdev_rssi_hist_tlv */		HTT_STATS_RX_PDEV_RSSI_HIST_TAG = 202, /* htt_stats_rx_pdev_rssi_hist_tlv */
	HTT_STATS_TX_VDEV_NSS_TAG = 203, /* htt_stats_tx_vdev_nss_tlv */
	HTT_STATS_PDEV_SPECTRAL_TAG = 204, /* htt_stats_pdev_spectral_tlv */
	HTT_STATS_PDEV_RTT_DELAY_TAG = 205, /* htt_stats_pdev_rtt_delay_tlv */
	HTT_STATS_PDEV_AOA_TAG = 206, /* htt_stats_pdev_aoa_tlv */
	HTT_STATS_PDEV_FTM_TPCCAL_TAG = 207, /* htt_stats_pdev_ftm_tpccal_tlv */

	HTT_STATS_MAX_TAG,		HTT_STATS_MAX_TAG,
	} htt_stats_tlv_tag_t;		} htt_stats_tlv_tag_t;
	@@ -23110,9 +23104,6 @@ typedef enum {
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_REACTIVATED_MSDUQ = 0x06,		HTT_SDWF_MSDUQ_CFG_IND_ERROR_REACTIVATED_MSDUQ = 0x06,
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_INVALID_SVC_CLASS = 0x07,		HTT_SDWF_MSDUQ_CFG_IND_ERROR_INVALID_SVC_CLASS = 0x07,
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_TIDQ_LOCATE_ERROR = 0x08,		HTT_SDWF_MSDUQ_CFG_IND_ERROR_TIDQ_LOCATE_ERROR = 0x08,
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_INCORRECT_SVC_CLASS = 0x09,
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_DISABLED_SVC_CLASS = 0x0a,
	HTT_SDWF_MSDUQ_CFG_IND_ERROR_SVC_CLASS_OUT_OF_RANGE = 0x0b,
	} HTT_SDWF_MSDUQ_CFG_IND_ERROR_CODE_E;		} HTT_SDWF_MSDUQ_CFG_IND_ERROR_CODE_E;

	PREPACK struct htt_t2h_sdwf_msduq_cfg_ind {		PREPACK struct htt_t2h_sdwf_msduq_cfg_ind {

drivers/staging/fw-api/fw/htt_stats.h

+65 −615

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/fw-api/fw/wlan_module_ids.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -191,8 +191,6 @@ typedef enum {
	WLAN_MODULE_PHYLIB_RRI, /* 0x94 */		WLAN_MODULE_PHYLIB_RRI, /* 0x94 */
	WLAN_MODULE_PHYLIB_SSCAN, /* 0x95 */		WLAN_MODULE_PHYLIB_SSCAN, /* 0x95 */
	WLAN_MODULE_PHYLIB_RSVD, /* 0x96 */		WLAN_MODULE_PHYLIB_RSVD, /* 0x96 */
	WLAN_MODULE_USD, /* 0x97 */
	WLAN_MODULE_C2C, /* 0x98 */


	WLAN_MODULE_ID_MAX,		WLAN_MODULE_ID_MAX,

drivers/staging/fw-api/fw/wlan_nan_msg.h

deleted100644 → 0

+0 −1834

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/fw-api/fw/wlan_nan_platform.h

deleted100644 → 0

+0 −15

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
	* SPDX-License-Identifier: ISC
	*/

	#ifndef _WLAN_NAN_PLATFORM_H_
	#define _WLAN_NAN_PLATFORM_H_

	typedef struct
	{
	}NAN_PLATFORM_MSG_HEADER;

	#define WLAN_NAN_MSG_COMMON_HEADER_V2

	#endif /* _WLAN_NAN_PLATFORM_H_ */