lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Add protection for type_specific_data in ath_pktlog_hdr

Browse Source 
The member of type_specific_data is not valid for ROME module. Add macro
protection for type_specific_data in the ath_pktlog_hdr to avoid offset
error when getting the msdu id info during  processing pktlog TX info.

Change-Id: Icb8b95cef9a32732116522e4fc3b39067ff36037
CRs-Fixed: 2522277
This commit is contained in:
Tiger Yu 2019-09-09 12:46:22 +08:00 committed by nshrivas
parent ac2b175b9b
commit bf14ba81a9
5 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Kbuild
View File

@ -2336,6 +2336,9 @@ cppflags-$(CONFIG_ATH_SUPPORT_SPECTRAL) += -DATH_SUPPORT_SPECTRAL
#Enable WDI Event support
cppflags-$(CONFIG_WDI_EVENT_ENABLE) += -DWDI_EVENT_ENABLE
#Enable the type_specific_data in the struct ath_pktlog_arg
cppflags-$(CONFIG_PKTLOG_HAS_SPECIFIC_DATA) += -DPKTLOG_HAS_SPECIFIC_DATA
#Endianness selection
ifeq ($(CONFIG_LITTLE_ENDIAN), y)
cppflags-y += -DANI_LITTLE_BYTE_ENDIAN

11
configs/default_defconfig
View File

@ -522,6 +522,17 @@ else
CONFIG_WDI_EVENT_ENABLE := y
endif
#Enable the type_specific_data in the ath_pktlog_arg
ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
ifeq ($(CONFIG_LITHIUM), y)
CONFIG_PKTLOG_HAS_SPECIFIC_DATA := y
endif
ifeq ($(CONFIG_HELIUMPLUS), y)
CONFIG_PKTLOG_HAS_SPECIFIC_DATA := y
endif
endif
#Endianness selection
CONFIG_LITTLE_ENDIAN := y

5
configs/genoa.common
View File

@ -88,6 +88,11 @@ else
CONFIG_WDI_EVENT_ENABLE := y
endif
#Enable the type_specific_data in the ath_pktlog_arg
ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
CONFIG_PKTLOG_HAS_SPECIFIC_DATA := y
endif
PANIC_ON_BUG := y
WLAN_WARN_ON_ASSERT := y
CONFIG_WLAN_LOGGING_SOCK_SVC := y

5
configs/qca6390_defconfig
View File

@ -457,6 +457,11 @@ else
CONFIG_WDI_EVENT_ENABLE := y
endif
#Enable the type_specific_data in the ath_pktlog_arg
ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
CONFIG_PKTLOG_HAS_SPECIFIC_DATA := y
endif
#Endianness selection
CONFIG_LITTLE_ENDIAN := y

4
uapi/linux/pktlog_ac_fmt.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2019 The Linux Foundation. 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
@ -61,7 +61,9 @@ struct ath_pktlog_hdr {
#endif
uint16_t size;
uint32_t timestamp;
#ifdef PKTLOG_HAS_SPECIFIC_DATA
uint32_t type_specific_data;
#endif
} __ATTRIB_PACK;
#define ATH_PKTLOG_HDR_FLAGS_MASK 0xffff