From bf57c2c31e6d81d5645b6ca42f1e2fde23df07f7 Mon Sep 17 00:00:00 2001 From: Tiger Yu Date: Tue, 13 Mar 2018 15:43:46 +0800 Subject: [PATCH] qcacld-3.0: Add protection for type_specific_data in ath_pktlog_hdr The member of type_specific_data is only valid for HELIUMPLUS. 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: I426e24db073e080d20cd5963ef89c521d0bfb106 CRs-Fixed: 2185588 --- uapi/linux/pktlog_ac_fmt.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uapi/linux/pktlog_ac_fmt.h b/uapi/linux/pktlog_ac_fmt.h index 826577e372..8e949d8bd0 100644 --- a/uapi/linux/pktlog_ac_fmt.h +++ b/uapi/linux/pktlog_ac_fmt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -69,7 +69,9 @@ struct ath_pktlog_hdr { #endif uint16_t size; uint32_t timestamp; +#ifdef HELIUMPLUS uint32_t type_specific_data; +#endif } __ATTRIB_PACK; /**