samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix the compiling error for macros SM/MS redefinition

Browse Source 
Fix the compiling error for macors SM/MS redefinition in both htc.h
and dfs_phyerr_tlv.h.

Change-Id: I591bc8a55542ff8f3b6ce27201c33164e4bdfb66
CRs-Fixed: 1102190
This commit is contained in:
gbian
2017-01-24 14:31:11 +08:00
committed by qcabuildsw
parent 1bd297c7d7
commit 32b067081b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/sap/dfs/src/dfs_phyerr_tlv.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2015,2017 The Linux Foundation. All rights reserved.
* *
* Previously licensed under the ISC license by Qualcomm Atheros, Inc. * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
* *
@@ -47,6 +47,8 @@
* to follow the convention that an _S suffix is appended for * to follow the convention that an _S suffix is appended for
* a shift count, while the field mask has no suffix. * a shift count, while the field mask has no suffix.
*/ */
#undef SM
#undef MS
#define SM(_v, _f) (((_v) << _f ## _S) & _f) #define SM(_v, _f) (((_v) << _f ## _S) & _f)
#define MS(_v, _f) (((_v) & _f) >> _f ## _S) #define MS(_v, _f) (((_v) & _f) >> _f ## _S)