From 4f149b3a87246207af48926842a85e3462736bb6 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Tue, 16 Jan 2018 10:56:45 -0800 Subject: [PATCH] qcacld-3.0: Fix checkpatch errors in frame parser code Fix checkpatch errors in auto-generated frame parser code. Change-Id: Ie2552e602fe7b01f00c1c82b046ce0e9fc3c6ebd CRs-Fixed: 2125026 --- core/mac/src/include/dot11f.h | 2 +- .../mac/src/sys/legacy/src/utils/src/dot11f.c | 32 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index cb83849b55b4..c40fee0cb41e 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 9 16:51:56 2018 from the following file(s): + * Tue Jan 16 10:54:27 2018 from the following file(s): * * dot11f.frms * diff --git a/core/mac/src/sys/legacy/src/utils/src/dot11f.c b/core/mac/src/sys/legacy/src/utils/src/dot11f.c index 78896813e0d4..c296099afd45 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -33,7 +33,7 @@ * * * This file was automatically generated by 'framesc' - * Tue Jan 9 16:51:56 2018 from the following file(s): + * Tue Jan 16 10:54:27 2018 from the following file(s): * * dot11f.frms * @@ -132,20 +132,24 @@ typedef struct sIEDefn { #if defined (DOT11F_HAVE_WIN32_API) #define DOT11F_PARAMETER_CHECK(pBuf, nBuf, pFrm, nFrm) \ - if (!pBuf || IsBadReadPtr(pBuf, nBuf))\ - return DOT11F_BAD_INPUT_BUFFER; \ - if (!pFrm || IsBadWritePtr(pFrm, nFrm))\ - return DOT11F_BAD_OUTPUT_BUFFER \ + do { \ + if (!pBuf || IsBadReadPtr(pBuf, nBuf))\ + return DOT11F_BAD_INPUT_BUFFER; \ + if (!pFrm || IsBadWritePtr(pFrm, nFrm))\ + return DOT11F_BAD_OUTPUT_BUFFER; \ + } while (0) #define DOT11F_PARAMETER_CHECK2(pSrc, pBuf, nBuf, pnConsumed) \ - if (!pSrc || IsBadReadPtr(pSrc, 4))\ - eturn DOT11F_BAD_INPUT_BUFFER; \ - if (!pBuf || IsBadWritePtr(pBuf, nBuf))\ - return DOT11F_BAD_OUTPUT_BUFFER; \ - if (!nBuf)\ - return DOT11F_BAD_OUTPUT_BUFFER; \ - if (IsBadWritePtr(pnConsumed, 4))\ - return DOT11F_BAD_OUTPUT_BUFFER \ + do { \ + if (!pSrc || IsBadReadPtr(pSrc, 4))\ + eturn DOT11F_BAD_INPUT_BUFFER; \ + if (!pBuf || IsBadWritePtr(pBuf, nBuf))\ + return DOT11F_BAD_OUTPUT_BUFFER; \ + if (!nBuf)\ + return DOT11F_BAD_OUTPUT_BUFFER; \ + if (IsBadWritePtr(pnConsumed, 4))\ + return DOT11F_BAD_OUTPUT_BUFFER; \ + } while (0) #else @@ -412,7 +416,7 @@ static void dot11f_unpack_ff_common_func(tpAniSirGlobal pCtx, } /* End dot11f_unpack_ff_common_func. */ static uint32_t dot11f_unpack_ie_common_func(tpAniSirGlobal pCtx, uint8_t *pBuf, - uint8_t ielen, uint8_t *pDstPresent , + uint8_t ielen, uint8_t *pDstPresent, uint8_t *pDstField) { uint32_t status = DOT11F_PARSE_SUCCESS;