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 clang errors in dot11f_get_packed_iersn

Browse Source 
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
This commit is contained in:
Vignesh Viswanathan
2017-12-07 00:07:39 +05:30
committed by snandini
parent ad9ddd8dff
commit 06296aa111
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mac/src/include/dot11f.h
View File

@@ -35,7 +35,7 @@
* *
* *
* This file was automatically generated by 'framesc' * This file was automatically generated by 'framesc'
* Mon Nov 13 14:20:26 2017 from the following file(s): * Thu Dec 7 00:22:18 2017 from the following file(s):
* *
* dot11f.frms * dot11f.frms
* *

20
core/mac/src/sys/legacy/src/utils/src/dot11f.c
View File

@@ -33,7 +33,7 @@
* *
* *
* This file was automatically generated by 'framesc' * This file was automatically generated by 'framesc'
* Mon Nov 13 14:20:26 2017 from the following file(s): * Thu Dec 7 00:22:18 2017 from the following file(s):
* *
* dot11f.frms * dot11f.frms
* *
@@ -13135,11 +13135,8 @@ uint32_t dot11f_get_packed_iersn(tpAniSirGlobal pCtx,
break; break;
} }
*pnNeeded += (pIe->akm_suite_count * 4); *pnNeeded += (pIe->akm_suite_count * 4);
if (pIe->RSN_Cap) { /* RSN_Cap */
*pnNeeded += 2; *pnNeeded += 2;
} else {
break;
}
if (pIe->pmkid_count) { if (pIe->pmkid_count) {
*pnNeeded += 2; *pnNeeded += 2;
} else { } else {
@@ -21475,13 +21472,10 @@ uint32_t dot11f_pack_ie_rsn(tpAniSirGlobal pCtx,
DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->akm_suites), (pSrc->akm_suite_count * 4)); DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->akm_suites), (pSrc->akm_suite_count * 4));
*pnConsumed += (pSrc->akm_suite_count * 4); *pnConsumed += (pSrc->akm_suite_count * 4);
pBuf += (pSrc->akm_suite_count * 4); pBuf += (pSrc->akm_suite_count * 4);
if (pSrc->RSN_Cap) { /* RSN_Cap */
DOT11F_MEMCPY(pCtx, pBuf, pSrc->RSN_Cap, 2); DOT11F_MEMCPY(pCtx, pBuf, pSrc->RSN_Cap, 2);
*pnConsumed += 2; *pnConsumed += 2;
pBuf += 2; pBuf += 2;
} else {
break;
}
if (pSrc->pmkid_count) { if (pSrc->pmkid_count) {
frameshtons(pCtx, pBuf, pSrc->pmkid_count, 0); frameshtons(pCtx, pBuf, pSrc->pmkid_count, 0);
*pnConsumed += 2; *pnConsumed += 2;