summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/mac/src/cfg/cfgUtil/dot11f.frms4
-rw-r--r--core/mac/src/include/dot11f.h8
-rw-r--r--core/mac/src/sys/legacy/src/utils/src/dot11f.c18
3 files changed, 15 insertions, 15 deletions
diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms
index b3165a78dc4a..74ba932edc3e 100644
--- a/core/mac/src/cfg/cfgUtil/dot11f.frms
+++ b/core/mac/src/cfg/cfgUtil/dot11f.frms
@@ -1393,12 +1393,12 @@ IE RSN (EID_RSN) // 7.3.2.25
// I don't see anything in the Standard limiting the number of Pairwise
// Cypher Suites, other than the maximum length of an IE, which limits us
// to 61. However, that seems needlessly wasteful of space.
- pwise_cipher_suites[4][0..4] COUNTIS pwise_cipher_suite_count;
+ pwise_cipher_suites[4][0..6] COUNTIS pwise_cipher_suite_count;
// Optional count of AKM suite selectors
OPTIONAL akm_suite_count, 2;
// Again, I see nothing in the Standard explicitly limiting the number of
// AKM suite selectors other than the maximum size of an IE.
- akm_suites[4][0..4] COUNTIS akm_suite_count;
+ akm_suites[4][0..6] COUNTIS akm_suite_count;
OPTIONAL RSN_Cap[2];
// Finally, the IE may contain zero or more PMKIDs:
OPTIONAL pmkid_count, 2;
diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h
index 2331bdc43bfe..850221cebd26 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'
- * Thu Jul 27 15:34:09 2017 from the following file(s):
+ * Thu Aug 3 18:27:10 2017 from the following file(s):
*
* dot11f.frms
*
@@ -6596,9 +6596,9 @@ typedef struct sDot11fIERSN {
uint16_t version /* Must be 1! */;
uint8_t gp_cipher_suite[4];
uint16_t pwise_cipher_suite_count;
- uint8_t pwise_cipher_suites[4][4];
+ uint8_t pwise_cipher_suites[6][4];
uint16_t akm_suite_count;
- uint8_t akm_suites[4][4];
+ uint8_t akm_suites[6][4];
uint8_t RSN_Cap[2];
uint16_t pmkid_count;
uint8_t pmkid[4][16];
@@ -6610,7 +6610,7 @@ typedef struct sDot11fIERSN {
/* N.B. These #defines do *not* include the EID & length */
#define DOT11F_IE_RSN_MIN_LEN (6)
-#define DOT11F_IE_RSN_MAX_LEN (114)
+#define DOT11F_IE_RSN_MAX_LEN (130)
#ifdef __cplusplus
extern "C" {
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 0dab1f06730a..b2275f77f92d 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'
- * Thu Jul 27 15:34:09 2017 from the following file(s):
+ * Thu Aug 3 18:27:10 2017 from the following file(s):
*
* dot11f.frms
*
@@ -4857,7 +4857,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx,
pBuf += 2;
ielen -= (uint8_t)2;
}
- if (pDst->pwise_cipher_suite_count > 4) {
+ if (pDst->pwise_cipher_suite_count > 6) {
pDst->present = 0;
return DOT11F_SKIPPED_BAD_IE;
}
@@ -4874,7 +4874,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx,
pBuf += 2;
ielen -= (uint8_t)2;
}
- if (pDst->akm_suite_count > 4) {
+ if (pDst->akm_suite_count > 6) {
pDst->present = 0;
return DOT11F_SKIPPED_BAD_IE;
}
@@ -7141,7 +7141,7 @@ static const tIEDefn IES_Beacon[] = {
present), 0, "ExtSuppRates", 0, 3, 14, SigIeExtSuppRates, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTSUPPRATES, 0, 0, },
{ offsetof(tDot11fBeacon, RSN), offsetof(tDot11fIERSN, present), 0, "RSN",
- 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fBeacon, QBSSLoad), offsetof(tDot11fIEQBSSLoad, present),
0, "QBSSLoad", 0, 7, 7, SigIeQBSSLoad, {0, 0, 0, 0, 0},
0, DOT11F_EID_QBSSLOAD, 0, 0, },
@@ -7560,7 +7560,7 @@ static const tIEDefn IES_BeaconIEs[] = {
0, 3, 14, SigIeExtSuppRates, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTSUPPRATES, 0, 0, },
{ offsetof(tDot11fBeaconIEs, RSN), offsetof(tDot11fIERSN, present), 0,
- "RSN", 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ "RSN", 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fBeaconIEs, QBSSLoad), offsetof(tDot11fIEQBSSLoad,
present), 0, "QBSSLoad", 0, 7, 7, SigIeQBSSLoad, {0, 0, 0, 0, 0},
0, DOT11F_EID_QBSSLOAD, 0, 0, },
@@ -8863,7 +8863,7 @@ static const tIEDefn IES_TDLSDisRsp[] = {
"SuppOperatingClasses", 0, 3, 34, SigIeSuppOperatingClasses,
{0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, 0, },
{ offsetof(tDot11fTDLSDisRsp, RSN), offsetof(tDot11fIERSN, present), 0,
- "RSN", 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ "RSN", 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fTDLSDisRsp, ExtCap), offsetof(tDot11fIEExtCap, present),
0, "ExtCap", 0, 3, 17, SigIeExtCap, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTCAP, 0, 0, },
@@ -8994,7 +8994,7 @@ static const tFFDefn FFS_TDLSSetupCnf[] = {
static const tIEDefn IES_TDLSSetupCnf[] = {
{ offsetof(tDot11fTDLSSetupCnf, RSN), offsetof(tDot11fIERSN, present), 0,
- "RSN", 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ "RSN", 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fTDLSSetupCnf, EDCAParamSet),
offsetof(tDot11fIEEDCAParamSet, present), 0, "EDCAParamSet",
0, 20, 20, SigIeEDCAParamSet, {0, 0, 0, 0, 0},
@@ -9069,7 +9069,7 @@ static const tIEDefn IES_TDLSSetupReq[] = {
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fTDLSSetupReq, RSN), offsetof(tDot11fIERSN, present), 0,
- "RSN", 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ "RSN", 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fTDLSSetupReq, ExtCap), offsetof(tDot11fIEExtCap,
present), 0, "ExtCap", 0, 3, 17, SigIeExtCap, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTCAP, 0, 0, },
@@ -9158,7 +9158,7 @@ static const tIEDefn IES_TDLSSetupRsp[] = {
0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0},
0, DOT11F_EID_SUPPCHANNELS, 0, 0, },
{ offsetof(tDot11fTDLSSetupRsp, RSN), offsetof(tDot11fIERSN, present), 0,
- "RSN", 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
+ "RSN", 0, 8, 132, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, 0, },
{ offsetof(tDot11fTDLSSetupRsp, ExtCap), offsetof(tDot11fIEExtCap,
present), 0, "ExtCap", 0, 3, 17, SigIeExtCap, {0, 0, 0, 0, 0},
0, DOT11F_EID_EXTCAP, 0, 0, },
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-07 12:07:58 +0000