diff options
| author | Vignesh Viswanathan <viswanat@codeaurora.org> | 2017-12-06 21:16:55 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-06 11:50:22 -0800 |
| commit | 7b2cdec456a01d928a5247ffdc8773921c72fd8e (patch) | |
| tree | dcb9a23e6c5d311f4013a18dc9cf8f352dfd1519 | |
| parent | 9e49ef0bd63afc9394fe0cd76b435155fa3cdf22 (diff) | |
qcacld-3.0: Fix clang errors in dot11f_get_packed_iersn
In function dot11f_get_packed_iersn, RSN_Cap is member of the structure
sDot11fIERSN and cannot be NULL.
Remove the NULL check for RSN_Cap in dot11f_get_packed_iersn
to fix Clang errors.
Change-Id: If334c66e6b84d9776b0f1f5c1e1969125d490f2f
CRs-Fixed: 2150438
| -rw-r--r-- | core/mac/src/include/dot11f.h | 2 | ||||
| -rw-r--r-- | core/mac/src/sys/legacy/src/utils/src/dot11f.c | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index 583b40f3137b..2159ab94426a 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' - * Thur Oct 12 17:18:09 2017 from the following file(s): + * Thu Dec 7 00:21:36 2017 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 6f3188a45f9a..f16f7f4aaa8e 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' - * Thur Oct 12 17:18:09 2017 from the following file(s): + * Thu Dec 7 00:21:36 2017 from the following file(s): * * dot11f.frms * @@ -12404,11 +12404,8 @@ uint32_t dot11f_get_packed_iersn(tpAniSirGlobal pCtx, break; } *pnNeeded += (pIe->akm_suite_count * 4); - if (pIe->RSN_Cap) { - *pnNeeded += 2; - } else { - break; - } + /* RSN_Cap */ + *pnNeeded += 2; if (pIe->pmkid_count) { *pnNeeded += 2; } else { @@ -20546,13 +20543,10 @@ uint32_t dot11f_pack_ie_rsn(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->akm_suites), (pSrc->akm_suite_count * 4)); *pnConsumed += (pSrc->akm_suite_count * 4); pBuf += (pSrc->akm_suite_count * 4); - if (pSrc->RSN_Cap) { - DOT11F_MEMCPY(pCtx, pBuf, pSrc->RSN_Cap, 2); - *pnConsumed += 2; - pBuf += 2; - } else { - break; - } + /* RSN_Cap */ + DOT11F_MEMCPY(pCtx, pBuf, pSrc->RSN_Cap, 2); + *pnConsumed += 2; + pBuf += 2; if (pSrc->pmkid_count) { frameshtons(pCtx, pBuf, pSrc->pmkid_count, 0); *pnConsumed += 2; |