Merge "qcacld-3.0: Fix clang errors in dot11f_get_packed_iersn" into wlan-cld3.driver.lnx.2.0

core/mac/src/include/dot11f.h

@@ -35,7 +35,7 @@
  *
  *
  * 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
  *

core/mac/src/sys/legacy/src/utils/src/dot11f.c

@@ -33,7 +33,7 @@
  *
  *
  * 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
  *
@@ -13135,11 +13135,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 {
@@ -21475,13 +21472,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;