qcacld: Fix for indicating 11mc ranging support in Beacon

For RTT3, we are supporting "Fine Timing Measurement" per 802.11mc. We are not supporting "Timing Measurement" per 802.11v. This change set enable Beacon's extended capabilities IE to indicate 11mc support by setting the "Fine Timing Measurement" bit. Change-Id: I4c39ba332e7e76017adac595d28ab33307b902ea CRs-Fixed: 701532
author: Krishna Kumaar Natarajan <kknatara@qca.qualcomm.com> 2014-08-04 12:58:42 -0700
committer: AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> 2014-09-19 21:29:31 +0530
commit: e9e6bfe27e16131daf7ddc649499509bc6c7b4eb (patch)
tree: 466823923c8b8f20009e1a34fb562e6958edc496
parent: e71c5961d0c9b5cc76f4439e06103d1c690c310b (diff)
12 files changed, 1703 insertions, 1081 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_oemdata.h b/CORE/HDD/inc/wlan_hdd_oemdata.h
index 1d0709d2ebd8..7751f85ae92f 100644
--- a/CORE/HDD/inc/wlan_hdd_oemdata.h
+++ b/CORE/HDD/inc/wlan_hdd_oemdata.h
@@ -143,7 +143,12 @@ typedef PACKED_PRE struct PACKED_POST
     /* vdev_id for the peer mac */
     tANI_U8 vdev_id;
 
-    /* peer capability: 0: RTT/RTT2, 1: RTT3. Default is 0 */
+    /* peer capability:
+     * 0: RTT/RTT2
+     * 1: RTT3(timing Meas Capability)
+     * 2: RTT3(fine timing Meas Capability)
+     * Default is 0
+     */
     tANI_U32 peer_capability;
 
     /* reserved0 */
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index bfa49a85baea..e8b5f1e615d0 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -819,6 +819,7 @@ void hdd_SendPeerStatusIndToOemApp(v_MACADDR_t *peerMac,
                 sizeof(peerMac->bytes));
    pPeerInfo->peer_status = peerStatus;
    pPeerInfo->vdev_id = sessionId;
+   /* peerTimingMeasCap - bit mask for timing and fine timing Meas Cap */
    pPeerInfo->peer_capability = peerTimingMeasCap;
    pPeerInfo->reserved0 = 0;
 
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 1b149c0b80e6..2a6821d615b8 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1167,7 +1167,7 @@ typedef struct sSirSmeJoinRsp
     /*Broadcast DPU signature*/
     tANI_U8            bcastSig;
 
-    /*Timing measurement capability*/
+    /* Timing and fine Timing measurement capability clubbed together */
     tANI_U8            timingMeasCap;
 
     tANI_U8         frames[ 1 ];
@@ -1246,7 +1246,7 @@ typedef struct sSirSmeAssocInd
     tANI_U32             assocReqLength;
     tANI_U8*             assocReqPtr;
 
-    /* Timing measurement capability */
+    /* Timing and fine Timing measurement capability clubbed together */
     tANI_U8              timingMeasCap;
     tSirSmeChanInfo      chan_info;
 } tSirSmeAssocInd, *tpSirSmeAssocInd;
@@ -5589,4 +5589,8 @@ typedef struct sAniGetLinkStatus
 #define member_size(type, member) (sizeof(((type *)0)->member))
 #endif
 
+#define RTT_INVALID                     0x00
+#define RTT_TIMING_MEAS_CAPABILITY      0x01
+#define RTT_FINE_TIMING_MEAS_CAPABILITY 0x02
+
 #endif /* __SIR_API_H */
diff --git a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
index b9f6ac3484a4..3d534b1477c4 100644
--- a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
+++ b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
@@ -2677,6 +2677,8 @@ IE ExtCap (EID_EXT_CAP)
         reserved3:                      1;
         spsmpCap:                       1;
         event:                          1;
+    }
+    {
         diagnostics:                    1;
         multiDiagnostics:               1;
         locTracking:                    1;
@@ -2685,6 +2687,8 @@ IE ExtCap (EID_EXT_CAP)
         coLocIntfReporting:             1;
         civicLoc:                       1;
         geospatialLoc:                  1;
+    }
+    {
         TFS:                            1;
         wnmSleepMode:                   1;
         timBroadcast:                   1;
@@ -2693,6 +2697,8 @@ IE ExtCap (EID_EXT_CAP)
         acStaCnt:                       1;
         multiBSSID:                     1;
         timingMeas:                     1;
+    }
+    {
         chanUsage:                      1;
         ssidList:                       1;
         DMS:                            1;
@@ -2711,18 +2717,43 @@ IE ExtCap (EID_EXT_CAP)
         TDLSSupport:                    1;
         TDLSProhibited:                 1;
         TDLSChanSwitProhibited:         1;
+    }
+    {
         rejectUnadmittedTraffic:        1;
         serviceIntervalGranularity:     3;
         identifierLoc:                  1;
         uapsdCoexistence:               1;
         wnmNotification:                1;
-        reserved5:                      1;
+        QABcapbility:                   1;
     }
     {
         UTF8SSID:                       1;
-        reserved6:                      12;
+        QMFActivated:                   1;
+        QMFreconAct:                    1;
+        RobustAVStreaming:              1;
+        AdvancedGCR:                    1;
+        MeshGCR:                        1;
+        SCS:                            1;
+        QLoadReport:                    1;
+    }
+    {
+        AlternateEDCA:                  1;
+        UnprotTXOPneg:                  1;
+        ProtTXOPneg:                    1;
+        reserved6:                      1;
+        ProtQLoadReport:                1;
         TDLSWiderBW:                    1;
         operModeNotification:           1;
+        maxNumOfMSDU_bit1:              1;
+    }
+    {
+        maxNumOfMSDU_bit2:              1;
+        ChanSchMgmt:                    1;
+        GeoDBInbandEnSignal:            1;
+        NwChanControl:                  1;
+        WhiteSpaceMap:                  1;
+        ChanAvailQuery:                 1;
+        fineTimingMeas:                 1;
         reserved7:                      1;
     }
 }
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h
index 065366a2eed9..a4c29b4dd43d 100644
--- a/CORE/MAC/src/include/dot11f.h
+++ b/CORE/MAC/src/include/dot11f.h
@@ -38,7 +38,7 @@
   *
   *
   * This file was automatically generated by 'framesc'
-  * Fri Sep 12 12:40:08 2014 from the following file(s):
+  * Mon Sep 15 19:24:53 2014 from the following file(s):
   *
   * dot11f.frms
   *
@@ -3570,65 +3570,84 @@ tANI_U32 dot11fGetPackedIEESEVersion(tpAniSirGlobal, tDot11fIEESEVersion*, tANI_
 // EID 127 (0x7f)
 typedef struct sDot11fIEExtCap {
     tANI_U8      present;
-    tANI_U32 bssCoexistMgmtSupport: 1;
-    tANI_U32        reserved1: 1;
-    tANI_U32    extChanSwitch: 1;
-    tANI_U32        reserved2: 1;
-    tANI_U32          psmpCap: 1;
-    tANI_U32        reserved3: 1;
-    tANI_U32         spsmpCap: 1;
-    tANI_U32            event: 1;
-    tANI_U32      diagnostics: 1;
-    tANI_U32 multiDiagnostics: 1;
-    tANI_U32      locTracking: 1;
-    tANI_U32              FMS: 1;
-    tANI_U32  proxyARPService: 1;
-    tANI_U32 coLocIntfReporting: 1;
-    tANI_U32         civicLoc: 1;
-    tANI_U32    geospatialLoc: 1;
-    tANI_U32              TFS: 1;
-    tANI_U32     wnmSleepMode: 1;
-    tANI_U32     timBroadcast: 1;
-    tANI_U32    bssTransition: 1;
-    tANI_U32    qosTrafficCap: 1;
-    tANI_U32         acStaCnt: 1;
-    tANI_U32       multiBSSID: 1;
-    tANI_U32       timingMeas: 1;
-    tANI_U32        chanUsage: 1;
-    tANI_U32         ssidList: 1;
-    tANI_U32              DMS: 1;
-    tANI_U32     UTCTSFOffset: 1;
-    tANI_U32 TDLSPeerUAPSDBufferSTA: 1;
-    tANI_U32  TDLSPeerPSMSupp: 1;
-    tANI_U32 TDLSChannelSwitching: 1;
-    tANI_U32 interworkingService: 1;
-    tANI_U16           qosMap: 1;
-    tANI_U16              EBR: 1;
-    tANI_U16    sspnInterface: 1;
-    tANI_U16        reserved4: 1;
-    tANI_U16         msgCFCap: 1;
-    tANI_U16      TDLSSupport: 1;
-    tANI_U16   TDLSProhibited: 1;
-    tANI_U16 TDLSChanSwitProhibited: 1;
-    tANI_U16 rejectUnadmittedTraffic: 1;
-    tANI_U16 serviceIntervalGranularity: 3;
-    tANI_U16    identifierLoc: 1;
-    tANI_U16 uapsdCoexistence: 1;
-    tANI_U16  wnmNotification: 1;
-    tANI_U16        reserved5: 1;
-    tANI_U16         UTF8SSID: 1;
-    tANI_U16        reserved6: 12;
-    tANI_U16      TDLSWiderBW: 1;
-    tANI_U16 operModeNotification: 1;
-    tANI_U16        reserved7: 1;
+    tANI_U8 bssCoexistMgmtSupport: 1;
+    tANI_U8        reserved1: 1;
+    tANI_U8    extChanSwitch: 1;
+    tANI_U8        reserved2: 1;
+    tANI_U8          psmpCap: 1;
+    tANI_U8        reserved3: 1;
+    tANI_U8         spsmpCap: 1;
+    tANI_U8            event: 1;
+    tANI_U8      diagnostics: 1;
+    tANI_U8 multiDiagnostics: 1;
+    tANI_U8      locTracking: 1;
+    tANI_U8              FMS: 1;
+    tANI_U8  proxyARPService: 1;
+    tANI_U8 coLocIntfReporting: 1;
+    tANI_U8         civicLoc: 1;
+    tANI_U8    geospatialLoc: 1;
+    tANI_U8              TFS: 1;
+    tANI_U8     wnmSleepMode: 1;
+    tANI_U8     timBroadcast: 1;
+    tANI_U8    bssTransition: 1;
+    tANI_U8    qosTrafficCap: 1;
+    tANI_U8         acStaCnt: 1;
+    tANI_U8       multiBSSID: 1;
+    tANI_U8       timingMeas: 1;
+    tANI_U8        chanUsage: 1;
+    tANI_U8         ssidList: 1;
+    tANI_U8              DMS: 1;
+    tANI_U8     UTCTSFOffset: 1;
+    tANI_U8 TDLSPeerUAPSDBufferSTA: 1;
+    tANI_U8  TDLSPeerPSMSupp: 1;
+    tANI_U8 TDLSChannelSwitching: 1;
+    tANI_U8 interworkingService: 1;
+    tANI_U8           qosMap: 1;
+    tANI_U8              EBR: 1;
+    tANI_U8    sspnInterface: 1;
+    tANI_U8        reserved4: 1;
+    tANI_U8         msgCFCap: 1;
+    tANI_U8      TDLSSupport: 1;
+    tANI_U8   TDLSProhibited: 1;
+    tANI_U8 TDLSChanSwitProhibited: 1;
+    tANI_U8 rejectUnadmittedTraffic: 1;
+    tANI_U8 serviceIntervalGranularity: 3;
+    tANI_U8    identifierLoc: 1;
+    tANI_U8 uapsdCoexistence: 1;
+    tANI_U8  wnmNotification: 1;
+    tANI_U8     QABcapbility: 1;
+    tANI_U8         UTF8SSID: 1;
+    tANI_U8     QMFActivated: 1;
+    tANI_U8      QMFreconAct: 1;
+    tANI_U8 RobustAVStreaming: 1;
+    tANI_U8      AdvancedGCR: 1;
+    tANI_U8          MeshGCR: 1;
+    tANI_U8              SCS: 1;
+    tANI_U8      QLoadReport: 1;
+    tANI_U8    AlternateEDCA: 1;
+    tANI_U8    UnprotTXOPneg: 1;
+    tANI_U8      ProtTXOPneg: 1;
+    tANI_U8        reserved6: 1;
+    tANI_U8  ProtQLoadReport: 1;
+    tANI_U8      TDLSWiderBW: 1;
+    tANI_U8 operModeNotification: 1;
+    tANI_U8 maxNumOfMSDU_bit1: 1;
+    tANI_U8 maxNumOfMSDU_bit2: 1;
+    tANI_U8      ChanSchMgmt: 1;
+    tANI_U8 GeoDBInbandEnSignal: 1;
+    tANI_U8    NwChanControl: 1;
+    tANI_U8    WhiteSpaceMap: 1;
+    tANI_U8   ChanAvailQuery: 1;
+    tANI_U8   fineTimingMeas: 1;
+    tANI_U8        reserved7: 1;
 } tDot11fIEExtCap;
 
 #define DOT11F_EID_EXTCAP ( 127 )
 
 // N.B. These #defines do *not* include the EID & length
-#define DOT11F_IE_EXTCAP_MIN_LEN ( 8 )
+#define DOT11F_IE_EXTCAP_MIN_LEN ( 9 )
 
-#define DOT11F_IE_EXTCAP_MAX_LEN ( 8 )
+#define DOT11F_IE_EXTCAP_MAX_LEN ( 9 )
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h
index 3ec1f5e38ac8..b60188e575e3 100644
--- a/CORE/MAC/src/include/dphGlobal.h
+++ b/CORE/MAC/src/include/dphGlobal.h
@@ -506,6 +506,7 @@ typedef struct sDphHashNode
     tANI_U32 vht_caps;
 #endif
 
+    /* Timing and fine Timing measurement capability clubbed together */
     tANI_U8 timingMeasCap;
 
     /* When a station with already an existing dph entry tries to
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 35c04d2beb48..50ea36f9dccd 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -1378,10 +1378,17 @@ if (limPopulateMatchingRateSet(pMac,
 
     if (pAssocReq->ExtCap.present)
     {
-        pStaDs->timingMeasCap = pAssocReq->ExtCap.timingMeas;
+        pStaDs->timingMeasCap = 0;
+        pStaDs->timingMeasCap |= (pAssocReq->ExtCap.timingMeas)?
+                                  RTT_TIMING_MEAS_CAPABILITY:
+                                  RTT_INVALID;
+        pStaDs->timingMeasCap |= (pAssocReq->ExtCap.fineTimingMeas)?
+                                  RTT_FINE_TIMING_MEAS_CAPABILITY:
+                                  RTT_INVALID;
         PELOG1(limLog(pMac, LOG1,
-               FL("ExtCap present, timingMeas: %d"),
-               pAssocReq->ExtCap.timingMeas);)
+               FL("ExtCap present, timingMeas: %d fineTimingMeas: %d"),
+               pAssocReq->ExtCap.timingMeas,
+               pAssocReq->ExtCap.fineTimingMeas);)
     }
     else
     {
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
index 24048b71611c..cceb1cc3b084 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
@@ -917,10 +917,17 @@ limProcessAssocRspFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tANI_U8 sub
 
     if (pAssocRsp->ExtCap.present)
     {
-        pStaDs->timingMeasCap = pAssocRsp->ExtCap.timingMeas;
+        pStaDs->timingMeasCap = 0;
+        pStaDs->timingMeasCap |= (pAssocRsp->ExtCap.timingMeas)?
+                                  RTT_TIMING_MEAS_CAPABILITY:
+                                  RTT_INVALID;
+        pStaDs->timingMeasCap |= (pAssocRsp->ExtCap.fineTimingMeas)?
+                                  RTT_FINE_TIMING_MEAS_CAPABILITY:
+                                  RTT_INVALID;
         PELOG1(limLog(pMac, LOG1,
-               FL("ExtCap present, timingMeas: %d"),
-               pAssocRsp->ExtCap.timingMeas);)
+               FL("ExtCap present, timingMeas: %d fineTimingMeas: %d"),
+               pAssocRsp->ExtCap.timingMeas,
+               pAssocRsp->ExtCap.fineTimingMeas);)
     }
     else
     {
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 41a6643ca34c..cbe451cbba77 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -164,10 +164,7 @@ void limUpdateExtCapIEtoStruct(tpAniSirGlobal pMac,
         return;
     }
     vos_mem_set(( tANI_U8* )&pOut[0], DOT11F_IE_EXTCAP_MAX_LEN, 0);
-    /* conversion should follow 4, 2, 2 byte order */
-    limUtilsframeshtonl(pMac, &pOut[0],*((tANI_U32*)&pBuf[2]),0);
-    limUtilsframeshtons(pMac, &pOut[4],*((tANI_U16*)&pBuf[6]),0);
-    limUtilsframeshtons(pMac, &pOut[6],*((tANI_U16*)&pBuf[8]),0);
+    vos_mem_copy(&pOut[0], &pBuf[2], DOT11F_IE_EXTCAP_MAX_LEN);
 
     if ( DOT11F_PARSE_SUCCESS != dot11fUnpackIeExtCap( pMac,
                 &pOut[0], DOT11F_IE_EXTCAP_MAX_LEN, pDst) )
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 710551db611b..0f9d035ee2b2 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1329,6 +1329,7 @@ typedef struct tagCsrRoamInfo
     tANI_S8 rxRssi;
     tSirSmeDfsEventInd dfs_event;
     tSirChanChangeResponse *channelChangeRespEvent;
+    /* Timing and fine Timing measurement capability clubbed together */
     tANI_U8 timingMeasCap;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
     tANI_U8 roamSynchInProgress;
@@ -1362,6 +1363,7 @@ typedef struct sSirSmeAssocIndToUpperLayerCnf
     tSirWAPIie           wapiIE;          // WAPI IE received from peer
     tSirAddie            addIE;           // Additional IE received from peer, which can be WSC and/or P2P IE
     tANI_U8              reassocReq;      //set to true if reassoc
+    /* Timing and fine Timing measurement capability clubbed together */
     tANI_U8              timingMeasCap;
     tSirSmeChanInfo      chan_info;
 } tSirSmeAssocIndToUpperLayerCnf, *tpSirSmeAssocIndToUpperLayerCnf;
diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c
index 5d19a13812b8..30fa410c190b 100644
--- a/CORE/SYS/legacy/src/utils/src/dot11f.c
+++ b/CORE/SYS/legacy/src/utils/src/dot11f.c
@@ -35,7 +35,7 @@
   *
   *
   * This file was automatically generated by 'framesc'
-  * Fri Sep 12 12:40:08 2014 from the following file(s):
+  * Mon Sep 15 19:24:53 2014 from the following file(s):
   *
   * dot11f.frms
   *
@@ -3175,15 +3175,24 @@ tANI_U32 dot11fUnpackIeESEVersion(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie
 tANI_U32 dot11fUnpackIeExtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEExtCap *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U32 tmp42__;
-    tANI_U16 tmp43__;
-    tANI_U16 tmp44__;
+    tANI_U8 tmp42__;
+    tANI_U8 tmp43__;
+    tANI_U8 tmp44__;
+    tANI_U8 tmp45__;
+    tANI_U8 tmp46__;
+    tANI_U8 tmp47__;
+    tANI_U8 tmp48__;
+    tANI_U8 tmp49__;
+    tANI_U8 tmp50__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    framesntohl(pCtx, &tmp42__, pBuf, 0);
-    pBuf += 4;
-    ielen -= 4;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp42__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
     pDst->bssCoexistMgmtSupport = tmp42__ >> 0 & 0x1;
     pDst->reserved1 = tmp42__ >> 1 & 0x1;
     pDst->extChanSwitch = tmp42__ >> 2 & 0x1;
@@ -3192,53 +3201,116 @@ tANI_U32 dot11fUnpackIeExtCap(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen,
     pDst->reserved3 = tmp42__ >> 5 & 0x1;
     pDst->spsmpCap = tmp42__ >> 6 & 0x1;
     pDst->event = tmp42__ >> 7 & 0x1;
-    pDst->diagnostics = tmp42__ >> 8 & 0x1;
-    pDst->multiDiagnostics = tmp42__ >> 9 & 0x1;
-    pDst->locTracking = tmp42__ >> 10 & 0x1;
-    pDst->FMS = tmp42__ >> 11 & 0x1;
-    pDst->proxyARPService = tmp42__ >> 12 & 0x1;
-    pDst->coLocIntfReporting = tmp42__ >> 13 & 0x1;
-    pDst->civicLoc = tmp42__ >> 14 & 0x1;
-    pDst->geospatialLoc = tmp42__ >> 15 & 0x1;
-    pDst->TFS = tmp42__ >> 16 & 0x1;
-    pDst->wnmSleepMode = tmp42__ >> 17 & 0x1;
-    pDst->timBroadcast = tmp42__ >> 18 & 0x1;
-    pDst->bssTransition = tmp42__ >> 19 & 0x1;
-    pDst->qosTrafficCap = tmp42__ >> 20 & 0x1;
-    pDst->acStaCnt = tmp42__ >> 21 & 0x1;
-    pDst->multiBSSID = tmp42__ >> 22 & 0x1;
-    pDst->timingMeas = tmp42__ >> 23 & 0x1;
-    pDst->chanUsage = tmp42__ >> 24 & 0x1;
-    pDst->ssidList = tmp42__ >> 25 & 0x1;
-    pDst->DMS = tmp42__ >> 26 & 0x1;
-    pDst->UTCTSFOffset = tmp42__ >> 27 & 0x1;
-    pDst->TDLSPeerUAPSDBufferSTA = tmp42__ >> 28 & 0x1;
-    pDst->TDLSPeerPSMSupp = tmp42__ >> 29 & 0x1;
-    pDst->TDLSChannelSwitching = tmp42__ >> 30 & 0x1;
-    pDst->interworkingService = tmp42__ >> 31 & 0x1;
-    framesntohs(pCtx, &tmp43__, pBuf, 0);
-    pBuf += 2;
-    ielen -= 2;
-    pDst->qosMap = tmp43__ >> 0 & 0x1;
-    pDst->EBR = tmp43__ >> 1 & 0x1;
-    pDst->sspnInterface = tmp43__ >> 2 & 0x1;
-    pDst->reserved4 = tmp43__ >> 3 & 0x1;
-    pDst->msgCFCap = tmp43__ >> 4 & 0x1;
-    pDst->TDLSSupport = tmp43__ >> 5 & 0x1;
-    pDst->TDLSProhibited = tmp43__ >> 6 & 0x1;
-    pDst->TDLSChanSwitProhibited = tmp43__ >> 7 & 0x1;
-    pDst->rejectUnadmittedTraffic = tmp43__ >> 8 & 0x1;
-    pDst->serviceIntervalGranularity = tmp43__ >> 9 & 0x7;
-    pDst->identifierLoc = tmp43__ >> 12 & 0x1;
-    pDst->uapsdCoexistence = tmp43__ >> 13 & 0x1;
-    pDst->wnmNotification = tmp43__ >> 14 & 0x1;
-    pDst->reserved5 = tmp43__ >> 15 & 0x1;
-    framesntohs(pCtx, &tmp44__, pBuf, 0);
-    pDst->UTF8SSID = tmp44__ >> 0 & 0x1;
-    pDst->reserved6 = tmp44__ >> 1 & 0xfff;
-    pDst->TDLSWiderBW = tmp44__ >> 13 & 0x1;
-    pDst->operModeNotification = tmp44__ >> 14 & 0x1;
-    pDst->reserved7 = tmp44__ >> 15 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp43__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->diagnostics = tmp43__ >> 0 & 0x1;
+    pDst->multiDiagnostics = tmp43__ >> 1 & 0x1;
+    pDst->locTracking = tmp43__ >> 2 & 0x1;
+    pDst->FMS = tmp43__ >> 3 & 0x1;
+    pDst->proxyARPService = tmp43__ >> 4 & 0x1;
+    pDst->coLocIntfReporting = tmp43__ >> 5 & 0x1;
+    pDst->civicLoc = tmp43__ >> 6 & 0x1;
+    pDst->geospatialLoc = tmp43__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp44__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->TFS = tmp44__ >> 0 & 0x1;
+    pDst->wnmSleepMode = tmp44__ >> 1 & 0x1;
+    pDst->timBroadcast = tmp44__ >> 2 & 0x1;
+    pDst->bssTransition = tmp44__ >> 3 & 0x1;
+    pDst->qosTrafficCap = tmp44__ >> 4 & 0x1;
+    pDst->acStaCnt = tmp44__ >> 5 & 0x1;
+    pDst->multiBSSID = tmp44__ >> 6 & 0x1;
+    pDst->timingMeas = tmp44__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp45__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->chanUsage = tmp45__ >> 0 & 0x1;
+    pDst->ssidList = tmp45__ >> 1 & 0x1;
+    pDst->DMS = tmp45__ >> 2 & 0x1;
+    pDst->UTCTSFOffset = tmp45__ >> 3 & 0x1;
+    pDst->TDLSPeerUAPSDBufferSTA = tmp45__ >> 4 & 0x1;
+    pDst->TDLSPeerPSMSupp = tmp45__ >> 5 & 0x1;
+    pDst->TDLSChannelSwitching = tmp45__ >> 6 & 0x1;
+    pDst->interworkingService = tmp45__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp46__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->qosMap = tmp46__ >> 0 & 0x1;
+    pDst->EBR = tmp46__ >> 1 & 0x1;
+    pDst->sspnInterface = tmp46__ >> 2 & 0x1;
+    pDst->reserved4 = tmp46__ >> 3 & 0x1;
+    pDst->msgCFCap = tmp46__ >> 4 & 0x1;
+    pDst->TDLSSupport = tmp46__ >> 5 & 0x1;
+    pDst->TDLSProhibited = tmp46__ >> 6 & 0x1;
+    pDst->TDLSChanSwitProhibited = tmp46__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp47__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->rejectUnadmittedTraffic = tmp47__ >> 0 & 0x1;
+    pDst->serviceIntervalGranularity = tmp47__ >> 1 & 0x7;
+    pDst->identifierLoc = tmp47__ >> 4 & 0x1;
+    pDst->uapsdCoexistence = tmp47__ >> 5 & 0x1;
+    pDst->wnmNotification = tmp47__ >> 6 & 0x1;
+    pDst->QABcapbility = tmp47__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp48__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->UTF8SSID = tmp48__ >> 0 & 0x1;
+    pDst->QMFActivated = tmp48__ >> 1 & 0x1;
+    pDst->QMFreconAct = tmp48__ >> 2 & 0x1;
+    pDst->RobustAVStreaming = tmp48__ >> 3 & 0x1;
+    pDst->AdvancedGCR = tmp48__ >> 4 & 0x1;
+    pDst->MeshGCR = tmp48__ >> 5 & 0x1;
+    pDst->SCS = tmp48__ >> 6 & 0x1;
+    pDst->QLoadReport = tmp48__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp49__ = *pBuf;
+    pBuf += 1;
+    ielen -= 1;
+    pDst->AlternateEDCA = tmp49__ >> 0 & 0x1;
+    pDst->UnprotTXOPneg = tmp49__ >> 1 & 0x1;
+    pDst->ProtTXOPneg = tmp49__ >> 2 & 0x1;
+    pDst->reserved6 = tmp49__ >> 3 & 0x1;
+    pDst->ProtQLoadReport = tmp49__ >> 4 & 0x1;
+    pDst->TDLSWiderBW = tmp49__ >> 5 & 0x1;
+    pDst->operModeNotification = tmp49__ >> 6 & 0x1;
+    pDst->maxNumOfMSDU_bit1 = tmp49__ >> 7 & 0x1;
+
+    if (!ielen) /* Check to ensure copying of ielen bytes */
+        goto endUnpackIeExtCap;
+    tmp50__ = *pBuf;
+    pDst->maxNumOfMSDU_bit2 = tmp50__ >> 0 & 0x1;
+    pDst->ChanSchMgmt = tmp50__ >> 1 & 0x1;
+    pDst->GeoDBInbandEnSignal = tmp50__ >> 2 & 0x1;
+    pDst->NwChanControl = tmp50__ >> 3 & 0x1;
+    pDst->WhiteSpaceMap = tmp50__ >> 4 & 0x1;
+    pDst->ChanAvailQuery = tmp50__ >> 5 & 0x1;
+    pDst->fineTimingMeas = tmp50__ >> 6 & 0x1;
+    pDst->reserved7 = tmp50__ >> 7 & 0x1;
+
+endUnpackIeExtCap:
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeExtCap. */
@@ -3364,15 +3436,15 @@ tANI_U32 dot11fUnpackIeFHPattTable(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i
 tANI_U32 dot11fUnpackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEFTInfo *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U16 tmp45__;
+    tANI_U16 tmp51__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    framesntohs(pCtx, &tmp45__, pBuf, 0);
+    framesntohs(pCtx, &tmp51__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->reserved = tmp45__ >> 0 & 0xff;
-    pDst->IECount = tmp45__ >> 8 & 0xff;
+    pDst->reserved = tmp51__ >> 0 & 0xff;
+    pDst->IECount = tmp51__ >> 8 & 0xff;
     DOT11F_MEMCPY(pCtx, pDst->MIC, pBuf, 16);
     pBuf += 16;
     ielen -= (tANI_U8)16;
@@ -3399,78 +3471,78 @@ tANI_U32 dot11fUnpackIeFTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen,
 tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTCaps *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U16 tmp46__;
-    tANI_U8 tmp47__;
-    tANI_U16 tmp48__;
-    tANI_U32 tmp49__;
-    tANI_U8 tmp50__;
+    tANI_U16 tmp52__;
+    tANI_U8 tmp53__;
+    tANI_U16 tmp54__;
+    tANI_U32 tmp55__;
+    tANI_U8 tmp56__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    framesntohs(pCtx, &tmp46__, pBuf, 0);
+    framesntohs(pCtx, &tmp52__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->advCodingCap = tmp46__ >> 0 & 0x1;
-    pDst->supportedChannelWidthSet = tmp46__ >> 1 & 0x1;
-    pDst->mimoPowerSave = tmp46__ >> 2 & 0x3;
-    pDst->greenField = tmp46__ >> 4 & 0x1;
-    pDst->shortGI20MHz = tmp46__ >> 5 & 0x1;
-    pDst->shortGI40MHz = tmp46__ >> 6 & 0x1;
-    pDst->txSTBC = tmp46__ >> 7 & 0x1;
-    pDst->rxSTBC = tmp46__ >> 8 & 0x3;
-    pDst->delayedBA = tmp46__ >> 10 & 0x1;
-    pDst->maximalAMSDUsize = tmp46__ >> 11 & 0x1;
-    pDst->dsssCckMode40MHz = tmp46__ >> 12 & 0x1;
-    pDst->psmp = tmp46__ >> 13 & 0x1;
-    pDst->stbcControlFrame = tmp46__ >> 14 & 0x1;
-    pDst->lsigTXOPProtection = tmp46__ >> 15 & 0x1;
-    tmp47__ = *pBuf;
+    pDst->advCodingCap = tmp52__ >> 0 & 0x1;
+    pDst->supportedChannelWidthSet = tmp52__ >> 1 & 0x1;
+    pDst->mimoPowerSave = tmp52__ >> 2 & 0x3;
+    pDst->greenField = tmp52__ >> 4 & 0x1;
+    pDst->shortGI20MHz = tmp52__ >> 5 & 0x1;
+    pDst->shortGI40MHz = tmp52__ >> 6 & 0x1;
+    pDst->txSTBC = tmp52__ >> 7 & 0x1;
+    pDst->rxSTBC = tmp52__ >> 8 & 0x3;
+    pDst->delayedBA = tmp52__ >> 10 & 0x1;
+    pDst->maximalAMSDUsize = tmp52__ >> 11 & 0x1;
+    pDst->dsssCckMode40MHz = tmp52__ >> 12 & 0x1;
+    pDst->psmp = tmp52__ >> 13 & 0x1;
+    pDst->stbcControlFrame = tmp52__ >> 14 & 0x1;
+    pDst->lsigTXOPProtection = tmp52__ >> 15 & 0x1;
+    tmp53__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->maxRxAMPDUFactor = tmp47__ >> 0 & 0x3;
-    pDst->mpduDensity = tmp47__ >> 2 & 0x7;
-    pDst->reserved1 = tmp47__ >> 5 & 0x7;
+    pDst->maxRxAMPDUFactor = tmp53__ >> 0 & 0x3;
+    pDst->mpduDensity = tmp53__ >> 2 & 0x7;
+    pDst->reserved1 = tmp53__ >> 5 & 0x7;
     DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16);
     pBuf += 16;
     ielen -= (tANI_U8)16;
-    framesntohs(pCtx, &tmp48__, pBuf, 0);
+    framesntohs(pCtx, &tmp54__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->pco = tmp48__ >> 0 & 0x1;
-    pDst->transitionTime = tmp48__ >> 1 & 0x3;
-    pDst->reserved2 = tmp48__ >> 3 & 0x1f;
-    pDst->mcsFeedback = tmp48__ >> 8 & 0x3;
-    pDst->reserved3 = tmp48__ >> 10 & 0x3f;
-    framesntohl(pCtx, &tmp49__, pBuf, 0);
+    pDst->pco = tmp54__ >> 0 & 0x1;
+    pDst->transitionTime = tmp54__ >> 1 & 0x3;
+    pDst->reserved2 = tmp54__ >> 3 & 0x1f;
+    pDst->mcsFeedback = tmp54__ >> 8 & 0x3;
+    pDst->reserved3 = tmp54__ >> 10 & 0x3f;
+    framesntohl(pCtx, &tmp55__, pBuf, 0);
     pBuf += 4;
     ielen -= 4;
-    pDst->txBF = tmp49__ >> 0 & 0x1;
-    pDst->rxStaggeredSounding = tmp49__ >> 1 & 0x1;
-    pDst->txStaggeredSounding = tmp49__ >> 2 & 0x1;
-    pDst->rxZLF = tmp49__ >> 3 & 0x1;
-    pDst->txZLF = tmp49__ >> 4 & 0x1;
-    pDst->implicitTxBF = tmp49__ >> 5 & 0x1;
-    pDst->calibration = tmp49__ >> 6 & 0x3;
-    pDst->explicitCSITxBF = tmp49__ >> 8 & 0x1;
-    pDst->explicitUncompressedSteeringMatrix = tmp49__ >> 9 & 0x1;
-    pDst->explicitBFCSIFeedback = tmp49__ >> 10 & 0x7;
-    pDst->explicitUncompressedSteeringMatrixFeedback = tmp49__ >> 13 & 0x7;
-    pDst->explicitCompressedSteeringMatrixFeedback = tmp49__ >> 16 & 0x7;
-    pDst->csiNumBFAntennae = tmp49__ >> 19 & 0x3;
-    pDst->uncompressedSteeringMatrixBFAntennae = tmp49__ >> 21 & 0x3;
-    pDst->compressedSteeringMatrixBFAntennae = tmp49__ >> 23 & 0x3;
-    pDst->reserved4 = tmp49__ >> 25 & 0x7f;
-    tmp50__ = *pBuf;
+    pDst->txBF = tmp55__ >> 0 & 0x1;
+    pDst->rxStaggeredSounding = tmp55__ >> 1 & 0x1;
+    pDst->txStaggeredSounding = tmp55__ >> 2 & 0x1;
+    pDst->rxZLF = tmp55__ >> 3 & 0x1;
+    pDst->txZLF = tmp55__ >> 4 & 0x1;
+    pDst->implicitTxBF = tmp55__ >> 5 & 0x1;
+    pDst->calibration = tmp55__ >> 6 & 0x3;
+    pDst->explicitCSITxBF = tmp55__ >> 8 & 0x1;
+    pDst->explicitUncompressedSteeringMatrix = tmp55__ >> 9 & 0x1;
+    pDst->explicitBFCSIFeedback = tmp55__ >> 10 & 0x7;
+    pDst->explicitUncompressedSteeringMatrixFeedback = tmp55__ >> 13 & 0x7;
+    pDst->explicitCompressedSteeringMatrixFeedback = tmp55__ >> 16 & 0x7;
+    pDst->csiNumBFAntennae = tmp55__ >> 19 & 0x3;
+    pDst->uncompressedSteeringMatrixBFAntennae = tmp55__ >> 21 & 0x3;
+    pDst->compressedSteeringMatrixBFAntennae = tmp55__ >> 23 & 0x3;
+    pDst->reserved4 = tmp55__ >> 25 & 0x7f;
+    tmp56__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->antennaSelection = tmp50__ >> 0 & 0x1;
-    pDst->explicitCSIFeedbackTx = tmp50__ >> 1 & 0x1;
-    pDst->antennaIndicesFeedbackTx = tmp50__ >> 2 & 0x1;
-    pDst->explicitCSIFeedback = tmp50__ >> 3 & 0x1;
-    pDst->antennaIndicesFeedback = tmp50__ >> 4 & 0x1;
-    pDst->rxAS = tmp50__ >> 5 & 0x1;
-    pDst->txSoundingPPDUs = tmp50__ >> 6 & 0x1;
-    pDst->reserved5 = tmp50__ >> 7 & 0x1;
+    pDst->antennaSelection = tmp56__ >> 0 & 0x1;
+    pDst->explicitCSIFeedbackTx = tmp56__ >> 1 & 0x1;
+    pDst->antennaIndicesFeedbackTx = tmp56__ >> 2 & 0x1;
+    pDst->explicitCSIFeedback = tmp56__ >> 3 & 0x1;
+    pDst->antennaIndicesFeedback = tmp56__ >> 4 & 0x1;
+    pDst->rxAS = tmp56__ >> 5 & 0x1;
+    pDst->txSoundingPPDUs = tmp56__ >> 6 & 0x1;
+    pDst->reserved5 = tmp56__ >> 7 & 0x1;
     pDst->num_rsvd = (tANI_U8)( ielen );
     if (ielen > 32){
         pDst->present = 0;
@@ -3488,41 +3560,41 @@ tANI_U32 dot11fUnpackIeHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen,
 tANI_U32 dot11fUnpackIeHTInfo(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEHTInfo *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp51__;
-    tANI_U16 tmp52__;
-    tANI_U16 tmp53__;
+    tANI_U8 tmp57__;
+    tANI_U16 tmp58__;
+    tANI_U16 tmp59__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     pDst->primaryChannel = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp51__ = *pBuf;
+    tmp57__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->secondaryChannelOffset = tmp51__ >> 0 & 0x3;
-    pDst->recommendedTxWidthSet = tmp51__ >> 2 & 0x1;
-    pDst->rifsMode = tmp51__ >> 3 & 0x1;
-    pDst->controlledAccessOnly = tmp51__ >> 4 & 0x1;
-    pDst->serviceIntervalGranularity = tmp51__ >> 5 & 0x7;
-    framesntohs(pCtx, &tmp52__, pBuf, 0);
+    pDst->secondaryChannelOffset = tmp57__ >> 0 & 0x3;
+    pDst->recommendedTxWidthSet = tmp57__ >> 2 & 0x1;
+    pDst->rifsMode = tmp57__ >> 3 & 0x1;
+    pDst->controlledAccessOnly = tmp57__ >> 4 & 0x1;
+    pDst->serviceIntervalGranularity = tmp57__ >> 5 & 0x7;
+    framesntohs(pCtx, &tmp58__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->opMode = tmp52__ >> 0 & 0x3;
-    pDst->nonGFDevicesPresent = tmp52__ >> 2 & 0x1;
-    pDst->transmitBurstLimit = tmp52__ >> 3 & 0x1;
-    pDst->obssNonHTStaPresent = tmp52__ >> 4 & 0x1;
-    pDst->reserved = tmp52__ >> 5 & 0x7ff;
-    framesntohs(pCtx, &tmp53__, pBuf, 0);
+    pDst->opMode = tmp58__ >> 0 & 0x3;
+    pDst->nonGFDevicesPresent = tmp58__ >> 2 & 0x1;
+    pDst->transmitBurstLimit = tmp58__ >> 3 & 0x1;
+    pDst->obssNonHTStaPresent = tmp58__ >> 4 & 0x1;
+    pDst->reserved = tmp58__ >> 5 & 0x7ff;
+    framesntohs(pCtx, &tmp59__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->basicSTBCMCS = tmp53__ >> 0 & 0x7f;
-    pDst->dualCTSProtection = tmp53__ >> 7 & 0x1;
-    pDst->secondaryBeacon = tmp53__ >> 8 & 0x1;
-    pDst->lsigTXOPProtectionFullSupport = tmp53__ >> 9 & 0x1;
-    pDst->pcoActive = tmp53__ >> 10 & 0x1;
-    pDst->pcoPhase = tmp53__ >> 11 & 0x1;
-    pDst->reserved2 = tmp53__ >> 12 & 0xf;
+    pDst->basicSTBCMCS = tmp59__ >> 0 & 0x7f;
+    pDst->dualCTSProtection = tmp59__ >> 7 & 0x1;
+    pDst->secondaryBeacon = tmp59__ >> 8 & 0x1;
+    pDst->lsigTXOPProtectionFullSupport = tmp59__ >> 9 & 0x1;
+    pDst->pcoActive = tmp59__ >> 10 & 0x1;
+    pDst->pcoPhase = tmp59__ >> 11 & 0x1;
+    pDst->reserved2 = tmp59__ >> 12 & 0xf;
     DOT11F_MEMCPY(pCtx, pDst->basicMCSSet, pBuf, 16);
     pBuf += 16;
     ielen -= (tANI_U8)16;
@@ -3586,22 +3658,22 @@ static const tIEDefn IES_reportBeacon[ ] = {
 tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMeasurementReport *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp54__;
-    tANI_U8 tmp55__;
-    tANI_U8 tmp56__;
+    tANI_U8 tmp60__;
+    tANI_U8 tmp61__;
+    tANI_U8 tmp62__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     pDst->token = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp54__ = *pBuf;
+    tmp60__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->late = tmp54__ >> 0 & 0x1;
-    pDst->incapable = tmp54__ >> 1 & 0x1;
-    pDst->refused = tmp54__ >> 2 & 0x1;
-    pDst->unused = tmp54__ >> 3 & 0x1f;
+    pDst->late = tmp60__ >> 0 & 0x1;
+    pDst->incapable = tmp60__ >> 1 & 0x1;
+    pDst->refused = tmp60__ >> 2 & 0x1;
+    pDst->unused = tmp60__ >> 3 & 0x1f;
     pDst->type = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
@@ -3623,15 +3695,15 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN
                 framesntohs(pCtx, &pDst->report.Basic.meas_duration, pBuf, 0);
                 pBuf += 2;
                 ielen -= (tANI_U8)2;
-                tmp55__ = *pBuf;
+                tmp61__ = *pBuf;
                 pBuf += 1;
                 ielen -= 1;
-                pDst->report.Basic.bss = tmp55__ >> 0 & 0x1;
-                pDst->report.Basic.ofdm_preamble = tmp55__ >> 1 & 0x1;
-                pDst->report.Basic.unid_signal = tmp55__ >> 2 & 0x1;
-                pDst->report.Basic.rader = tmp55__ >> 3 & 0x1;
-                pDst->report.Basic.unmeasured = tmp55__ >> 4 & 0x1;
-                pDst->report.Basic.unused = tmp55__ >> 5 & 0x7;
+                pDst->report.Basic.bss = tmp61__ >> 0 & 0x1;
+                pDst->report.Basic.ofdm_preamble = tmp61__ >> 1 & 0x1;
+                pDst->report.Basic.unid_signal = tmp61__ >> 2 & 0x1;
+                pDst->report.Basic.rader = tmp61__ >> 3 & 0x1;
+                pDst->report.Basic.unmeasured = tmp61__ >> 4 & 0x1;
+                pDst->report.Basic.unused = tmp61__ >> 5 & 0x7;
             break;
             case 1:
                 pDst->report.CCA.channel = *pBuf;
@@ -3695,11 +3767,11 @@ tANI_U32 dot11fUnpackIeMeasurementReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tAN
                 framesntohs(pCtx, &pDst->report.Beacon.meas_duration, pBuf, 0);
                 pBuf += 2;
                 ielen -= (tANI_U8)2;
-                tmp56__ = *pBuf;
+                tmp62__ = *pBuf;
                 pBuf += 1;
                 ielen -= 1;
-                pDst->report.Beacon.condensed_PHY = tmp56__ >> 0 & 0x7f;
-                pDst->report.Beacon.reported_frame_type = tmp56__ >> 7 & 0x1;
+                pDst->report.Beacon.condensed_PHY = tmp62__ >> 0 & 0x7f;
+                pDst->report.Beacon.reported_frame_type = tmp62__ >> 7 & 0x1;
                 pDst->report.Beacon.RCPI = *pBuf;
                 pBuf += 1;
                 ielen -= (tANI_U8)1;
@@ -3748,22 +3820,22 @@ static const tIEDefn IES_measurement_requestBeacon[ ] = {
 tANI_U32 dot11fUnpackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMeasurementRequest *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp57__;
+    tANI_U8 tmp63__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     pDst->measurement_token = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp57__ = *pBuf;
+    tmp63__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->parallel = tmp57__ >> 0 & 0x1;
-    pDst->enable = tmp57__ >> 1 & 0x1;
-    pDst->request = tmp57__ >> 2 & 0x1;
-    pDst->report = tmp57__ >> 3 & 0x1;
-    pDst->durationMandatory = tmp57__ >> 4 & 0x1;
-    pDst->unused = tmp57__ >> 5 & 0x7;
+    pDst->parallel = tmp63__ >> 0 & 0x1;
+    pDst->enable = tmp63__ >> 1 & 0x1;
+    pDst->request = tmp63__ >> 2 & 0x1;
+    pDst->report = tmp63__ >> 3 & 0x1;
+    pDst->durationMandatory = tmp63__ >> 4 & 0x1;
+    pDst->unused = tmp63__ >> 5 & 0x7;
     pDst->measurement_type = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
@@ -3840,17 +3912,17 @@ tANI_U32 dot11fUnpackIeMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA
 tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEMobilityDomain *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp58__;
+    tANI_U8 tmp64__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     framesntohs(pCtx, &pDst->MDID, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    tmp58__ = *pBuf;
-    pDst->overDSCap = tmp58__ >> 0 & 0x1;
-    pDst->resourceReqCap = tmp58__ >> 1 & 0x1;
-    pDst->reserved = tmp58__ >> 2 & 0x3f;
+    tmp64__ = *pBuf;
+    pDst->overDSCap = tmp64__ >> 0 & 0x1;
+    pDst->resourceReqCap = tmp64__ >> 1 & 0x1;
+    pDst->reserved = tmp64__ >> 2 & 0x3f;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeMobilityDomain. */
@@ -3874,31 +3946,31 @@ tANI_U32 dot11fUnpackIeMobilityDomain(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U
 tANI_U32 dot11fUnpackIeNeighborReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIENeighborReport *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp59__;
-    tANI_U8 tmp60__;
+    tANI_U8 tmp65__;
+    tANI_U8 tmp66__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6);
     pBuf += 6;
     ielen -= (tANI_U8)6;
-    tmp59__ = *pBuf;
+    tmp65__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->APReachability = tmp59__ >> 0 & 0x3;
-    pDst->Security = tmp59__ >> 2 & 0x1;
-    pDst->KeyScope = tmp59__ >> 3 & 0x1;
-    pDst->SpecMgmtCap = tmp59__ >> 4 & 0x1;
-    pDst->QosCap = tmp59__ >> 5 & 0x1;
-    pDst->apsd = tmp59__ >> 6 & 0x1;
-    pDst->rrm = tmp59__ >> 7 & 0x1;
-    tmp60__ = *pBuf;
+    pDst->APReachability = tmp65__ >> 0 & 0x3;
+    pDst->Security = tmp65__ >> 2 & 0x1;
+    pDst->KeyScope = tmp65__ >> 3 & 0x1;
+    pDst->SpecMgmtCap = tmp65__ >> 4 & 0x1;
+    pDst->QosCap = tmp65__ >> 5 & 0x1;
+    pDst->apsd = tmp65__ >> 6 & 0x1;
+    pDst->rrm = tmp65__ >> 7 & 0x1;
+    tmp66__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->DelayedBA = tmp60__ >> 0 & 0x1;
-    pDst->ImmBA = tmp60__ >> 1 & 0x1;
-    pDst->MobilityDomain = tmp60__ >> 2 & 0x1;
-    pDst->reserved = tmp60__ >> 3 & 0x1f;
+    pDst->DelayedBA = tmp66__ >> 0 & 0x1;
+    pDst->ImmBA = tmp66__ >> 1 & 0x1;
+    pDst->MobilityDomain = tmp66__ >> 2 & 0x1;
+    pDst->reserved = tmp66__ >> 3 & 0x1f;
     framesntohs(pCtx, &pDst->reserved1, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
@@ -3960,15 +4032,15 @@ tANI_U32 dot11fUnpackIeOBSSScanParameters(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tA
 tANI_U32 dot11fUnpackIeOperatingMode(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOperatingMode *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp61__;
+    tANI_U8 tmp67__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    tmp61__ = *pBuf;
-    pDst->chanWidth = tmp61__ >> 0 & 0x3;
-    pDst->reserved = tmp61__ >> 2 & 0x3;
-    pDst->rxNSS = tmp61__ >> 4 & 0x7;
-    pDst->rxNSSType = tmp61__ >> 7 & 0x1;
+    tmp67__ = *pBuf;
+    pDst->chanWidth = tmp67__ >> 0 & 0x3;
+    pDst->reserved = tmp67__ >> 2 & 0x3;
+    pDst->rxNSS = tmp67__ >> 4 & 0x7;
+    pDst->rxNSSType = tmp67__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeOperatingMode. */
@@ -4409,16 +4481,16 @@ tANI_U32 dot11fUnpackIePTIControl(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ie
 tANI_U32 dot11fUnpackIePUBufferStatus(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPUBufferStatus *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp62__;
+    tANI_U8 tmp68__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    tmp62__ = *pBuf;
-    pDst->ac_bk_traffic_aval = tmp62__ >> 0 & 0x1;
-    pDst->ac_be_traffic_aval = tmp62__ >> 1 & 0x1;
-    pDst->ac_vi_traffic_aval = tmp62__ >> 2 & 0x1;
-    pDst->ac_vo_traffic_aval = tmp62__ >> 3 & 0x1;
-    pDst->reserved = tmp62__ >> 4 & 0xf;
+    tmp68__ = *pBuf;
+    pDst->ac_bk_traffic_aval = tmp68__ >> 0 & 0x1;
+    pDst->ac_be_traffic_aval = tmp68__ >> 1 & 0x1;
+    pDst->ac_vi_traffic_aval = tmp68__ >> 2 & 0x1;
+    pDst->ac_vo_traffic_aval = tmp68__ >> 3 & 0x1;
+    pDst->reserved = tmp68__ >> 4 & 0xf;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIePUBufferStatus. */
@@ -4480,16 +4552,16 @@ tANI_U32 dot11fUnpackIeQBSSLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iele
 tANI_U32 dot11fUnpackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsAp *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp63__;
+    tANI_U8 tmp69__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    tmp63__ = *pBuf;
-    pDst->count = tmp63__ >> 0 & 0xf;
-    pDst->qack = tmp63__ >> 4 & 0x1;
-    pDst->qreq = tmp63__ >> 5 & 0x1;
-    pDst->txopreq = tmp63__ >> 6 & 0x1;
-    pDst->reserved = tmp63__ >> 7 & 0x1;
+    tmp69__ = *pBuf;
+    pDst->count = tmp69__ >> 0 & 0xf;
+    pDst->qack = tmp69__ >> 4 & 0x1;
+    pDst->qreq = tmp69__ >> 5 & 0x1;
+    pDst->txopreq = tmp69__ >> 6 & 0x1;
+    pDst->reserved = tmp69__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeQOSCapsAp. */
@@ -4500,18 +4572,18 @@ tANI_U32 dot11fUnpackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel
 tANI_U32 dot11fUnpackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsStation *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp64__;
+    tANI_U8 tmp70__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    tmp64__ = *pBuf;
-    pDst->acvo_uapsd = tmp64__ >> 0 & 0x1;
-    pDst->acvi_uapsd = tmp64__ >> 1 & 0x1;
-    pDst->acbk_uapsd = tmp64__ >> 2 & 0x1;
-    pDst->acbe_uapsd = tmp64__ >> 3 & 0x1;
-    pDst->qack = tmp64__ >> 4 & 0x1;
-    pDst->max_sp_length = tmp64__ >> 5 & 0x3;
-    pDst->more_data_ack = tmp64__ >> 7 & 0x1;
+    tmp70__ = *pBuf;
+    pDst->acvo_uapsd = tmp70__ >> 0 & 0x1;
+    pDst->acvi_uapsd = tmp70__ >> 1 & 0x1;
+    pDst->acbk_uapsd = tmp70__ >> 2 & 0x1;
+    pDst->acbe_uapsd = tmp70__ >> 3 & 0x1;
+    pDst->qack = tmp70__ >> 4 & 0x1;
+    pDst->max_sp_length = tmp70__ >> 5 & 0x3;
+    pDst->more_data_ack = tmp70__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeQOSCapsStation. */
@@ -4900,49 +4972,49 @@ tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_
 tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U32 tmp65__;
-    tANI_U16 tmp66__;
-    tANI_U16 tmp67__;
+    tANI_U32 tmp71__;
+    tANI_U16 tmp72__;
+    tANI_U16 tmp73__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
-    framesntohl(pCtx, &tmp65__, pBuf, 0);
+    framesntohl(pCtx, &tmp71__, pBuf, 0);
     pBuf += 4;
     ielen -= 4;
-    pDst->maxMPDULen = tmp65__ >> 0 & 0x3;
-    pDst->supportedChannelWidthSet = tmp65__ >> 2 & 0x3;
-    pDst->ldpcCodingCap = tmp65__ >> 4 & 0x1;
-    pDst->shortGI80MHz = tmp65__ >> 5 & 0x1;
-    pDst->shortGI160and80plus80MHz = tmp65__ >> 6 & 0x1;
-    pDst->txSTBC = tmp65__ >> 7 & 0x1;
-    pDst->rxSTBC = tmp65__ >> 8 & 0x7;
-    pDst->suBeamFormerCap = tmp65__ >> 11 & 0x1;
-    pDst->suBeamformeeCap = tmp65__ >> 12 & 0x1;
-    pDst->csnofBeamformerAntSup = tmp65__ >> 13 & 0x7;
-    pDst->numSoundingDim = tmp65__ >> 16 & 0x7;
-    pDst->muBeamformerCap = tmp65__ >> 19 & 0x1;
-    pDst->muBeamformeeCap = tmp65__ >> 20 & 0x1;
-    pDst->vhtTXOPPS = tmp65__ >> 21 & 0x1;
-    pDst->htcVHTCap = tmp65__ >> 22 & 0x1;
-    pDst->maxAMPDULenExp = tmp65__ >> 23 & 0x7;
-    pDst->vhtLinkAdaptCap = tmp65__ >> 26 & 0x3;
-    pDst->rxAntPattern = tmp65__ >> 28 & 0x1;
-    pDst->txAntPattern = tmp65__ >> 29 & 0x1;
-    pDst->reserved1 = tmp65__ >> 30 & 0x3;
+    pDst->maxMPDULen = tmp71__ >> 0 & 0x3;
+    pDst->supportedChannelWidthSet = tmp71__ >> 2 & 0x3;
+    pDst->ldpcCodingCap = tmp71__ >> 4 & 0x1;
+    pDst->shortGI80MHz = tmp71__ >> 5 & 0x1;
+    pDst->shortGI160and80plus80MHz = tmp71__ >> 6 & 0x1;
+    pDst->txSTBC = tmp71__ >> 7 & 0x1;
+    pDst->rxSTBC = tmp71__ >> 8 & 0x7;
+    pDst->suBeamFormerCap = tmp71__ >> 11 & 0x1;
+    pDst->suBeamformeeCap = tmp71__ >> 12 & 0x1;
+    pDst->csnofBeamformerAntSup = tmp71__ >> 13 & 0x7;
+    pDst->numSoundingDim = tmp71__ >> 16 & 0x7;
+    pDst->muBeamformerCap = tmp71__ >> 19 & 0x1;
+    pDst->muBeamformeeCap = tmp71__ >> 20 & 0x1;
+    pDst->vhtTXOPPS = tmp71__ >> 21 & 0x1;
+    pDst->htcVHTCap = tmp71__ >> 22 & 0x1;
+    pDst->maxAMPDULenExp = tmp71__ >> 23 & 0x7;
+    pDst->vhtLinkAdaptCap = tmp71__ >> 26 & 0x3;
+    pDst->rxAntPattern = tmp71__ >> 28 & 0x1;
+    pDst->txAntPattern = tmp71__ >> 29 & 0x1;
+    pDst->reserved1 = tmp71__ >> 30 & 0x3;
     framesntohs(pCtx, &pDst->rxMCSMap, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    framesntohs(pCtx, &tmp66__, pBuf, 0);
+    framesntohs(pCtx, &tmp72__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->rxHighSupDataRate = tmp66__ >> 0 & 0x1fff;
-    pDst->reserved2 = tmp66__ >> 13 & 0x7;
+    pDst->rxHighSupDataRate = tmp72__ >> 0 & 0x1fff;
+    pDst->reserved2 = tmp72__ >> 13 & 0x7;
     framesntohs(pCtx, &pDst->txMCSMap, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    framesntohs(pCtx, &tmp67__, pBuf, 0);
-    pDst->txSupDataRate = tmp67__ >> 0 & 0x1fff;
-    pDst->reserved3 = tmp67__ >> 13 & 0x7;
+    framesntohs(pCtx, &tmp73__, pBuf, 0);
+    pDst->txSupDataRate = tmp73__ >> 0 & 0x1fff;
+    pDst->reserved3 = tmp73__ >> 13 & 0x7;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeVHTCaps. */
@@ -5041,7 +5113,7 @@ tANI_U32 dot11fUnpackIeVendor3IE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel
 tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U16 tmp68__;
+    tANI_U16 tmp74__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
@@ -5078,11 +5150,11 @@ tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, t
     DOT11F_MEMCPY(pCtx, pDst->multicast_cipher_suite, pBuf, 4);
     pBuf += 4;
     ielen -= (tANI_U8)4;
-    framesntohs(pCtx, &tmp68__, pBuf, 0);
+    framesntohs(pCtx, &tmp74__, pBuf, 0);
     pBuf += 2;
     ielen -= 2;
-    pDst->preauth = tmp68__ >> 0 & 0x1;
-    pDst->reserved = tmp68__ >> 1 & 0x7fff;
+    pDst->preauth = tmp74__ >> 0 & 0x1;
+    pDst->reserved = tmp74__ >> 1 & 0x7fff;
     if ( ! ielen )
     {
         pDst->bkid_count = 0U;
@@ -5167,7 +5239,7 @@ tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 i
 tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp69__;
+    tANI_U8 tmp75__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
@@ -5179,12 +5251,12 @@ tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen
             pDst->present = 0;
             return ( status | DOT11F_BAD_FIXED_VALUE );
     }
-    tmp69__ = *pBuf;
-    pDst->reserved = tmp69__ >> 0 & 0xf;
-    pDst->qack = tmp69__ >> 4 & 0x1;
-    pDst->queue_request = tmp69__ >> 5 & 0x1;
-    pDst->txop_request = tmp69__ >> 6 & 0x1;
-    pDst->more_ack = tmp69__ >> 7 & 0x1;
+    tmp75__ = *pBuf;
+    pDst->reserved = tmp75__ >> 0 & 0xf;
+    pDst->qack = tmp75__ >> 4 & 0x1;
+    pDst->queue_request = tmp75__ >> 5 & 0x1;
+    pDst->txop_request = tmp75__ >> 6 & 0x1;
+    pDst->more_ack = tmp75__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeWMMCaps. */
@@ -5195,17 +5267,17 @@ tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen
 tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp70__;
+    tANI_U8 tmp76__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     pDst->version = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp70__ = *pBuf;
-    pDst->param_set_count = tmp70__ >> 0 & 0xf;
-    pDst->reserved = tmp70__ >> 4 & 0x7;
-    pDst->uapsd = tmp70__ >> 7 & 0x1;
+    tmp76__ = *pBuf;
+    pDst->param_set_count = tmp76__ >> 0 & 0xf;
+    pDst->reserved = tmp76__ >> 4 & 0x7;
+    pDst->uapsd = tmp76__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeWMMInfoAp. */
@@ -5216,21 +5288,21 @@ tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel
 tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp71__;
+    tANI_U8 tmp77__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
     pDst->version = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp71__ = *pBuf;
-    pDst->acvo_uapsd = tmp71__ >> 0 & 0x1;
-    pDst->acvi_uapsd = tmp71__ >> 1 & 0x1;
-    pDst->acbk_uapsd = tmp71__ >> 2 & 0x1;
-    pDst->acbe_uapsd = tmp71__ >> 3 & 0x1;
-    pDst->reserved1 = tmp71__ >> 4 & 0x1;
-    pDst->max_sp_length = tmp71__ >> 5 & 0x3;
-    pDst->reserved2 = tmp71__ >> 7 & 0x1;
+    tmp77__ = *pBuf;
+    pDst->acvo_uapsd = tmp77__ >> 0 & 0x1;
+    pDst->acvi_uapsd = tmp77__ >> 1 & 0x1;
+    pDst->acbk_uapsd = tmp77__ >> 2 & 0x1;
+    pDst->acbe_uapsd = tmp77__ >> 3 & 0x1;
+    pDst->reserved1 = tmp77__ >> 4 & 0x1;
+    pDst->max_sp_length = tmp77__ >> 5 & 0x3;
+    pDst->reserved2 = tmp77__ >> 7 & 0x1;
     (void)pCtx;
     return status;
 } /* End dot11fUnpackIeWMMInfoStation. */
@@ -5241,14 +5313,14 @@ tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U
 tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst)
 {
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
-    tANI_U8 tmp72__;
-    tANI_U8 tmp73__;
-    tANI_U8 tmp74__;
-    tANI_U8 tmp75__;
-    tANI_U8 tmp76__;
-    tANI_U8 tmp77__;
     tANI_U8 tmp78__;
     tANI_U8 tmp79__;
+    tANI_U8 tmp80__;
+    tANI_U8 tmp81__;
+    tANI_U8 tmp82__;
+    tANI_U8 tmp83__;
+    tANI_U8 tmp84__;
+    tANI_U8 tmp85__;
     (void) pBuf; (void)ielen; /* Shutup the compiler */
     if (pDst->present) status = DOT11F_DUPLICATE_IE;
     pDst->present = 1;
@@ -5266,63 +5338,63 @@ tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 iel
     pDst->reserved2 = *pBuf;
     pBuf += 1;
     ielen -= (tANI_U8)1;
-    tmp72__ = *pBuf;
+    tmp78__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acbe_aifsn = tmp72__ >> 0 & 0xf;
-    pDst->acbe_acm = tmp72__ >> 4 & 0x1;
-    pDst->acbe_aci = tmp72__ >> 5 & 0x3;
-    pDst->unused1 = tmp72__ >> 7 & 0x1;
-    tmp73__ = *pBuf;
+    pDst->acbe_aifsn = tmp78__ >> 0 & 0xf;
+    pDst->acbe_acm = tmp78__ >> 4 & 0x1;
+    pDst->acbe_aci = tmp78__ >> 5 & 0x3;
+    pDst->unused1 = tmp78__ >> 7 & 0x1;
+    tmp79__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acbe_acwmin = tmp73__ >> 0 & 0xf;
-    pDst->acbe_acwmax = tmp73__ >> 4 & 0xf;
+    pDst->acbe_acwmin = tmp79__ >> 0 & 0xf;
+    pDst->acbe_acwmax = tmp79__ >> 4 & 0xf;
     framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    tmp74__ = *pBuf;
+    tmp80__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acbk_aifsn = tmp74__ >> 0 & 0xf;
-    pDst->acbk_acm = tmp74__ >> 4 & 0x1;
-    pDst->acbk_aci = tmp74__ >> 5 & 0x3;
-    pDst->unused2 = tmp74__ >> 7 & 0x1;
-    tmp75__ = *pBuf;
+    pDst->acbk_aifsn = tmp80__ >> 0 & 0xf;
+    pDst->acbk_acm = tmp80__ >> 4 & 0x1;
+    pDst->acbk_aci = tmp80__ >> 5 & 0x3;
+    pDst->unused2 = tmp80__ >> 7 & 0x1;
+    tmp81__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acbk_acwmin = tmp75__ >> 0 & 0xf;
-    pDst->acbk_acwmax = tmp75__ >> 4 & 0xf;
+    pDst->acbk_acwmin = tmp81__ >> 0 & 0xf;
+    pDst->acbk_acwmax = tmp81__ >> 4 & 0xf;
     framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    tmp76__ = *pBuf;
+    tmp82__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acvi_aifsn = tmp76__ >> 0 & 0xf;
-    pDst->acvi_acm = tmp76__ >> 4 & 0x1;
-    pDst->acvi_aci = tmp76__ >> 5 & 0x3;
-    pDst->unused3 = tmp76__ >> 7 & 0x1;
-    tmp77__ = *pBuf;
+    pDst->acvi_aifsn = tmp82__ >> 0 & 0xf;
+    pDst->acvi_acm = tmp82__ >> 4 & 0x1;
+    pDst->acvi_aci = tmp82__ >> 5 & 0x3;
+    pDst->unused3 = tmp82__ >> 7 & 0x1;
+    tmp83__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acvi_acwmin = tmp77__ >> 0 & 0xf;
-    pDst->acvi_acwmax = tmp77__ >> 4 & 0xf;
+    pDst->acvi_acwmin = tmp83__ >> 0 & 0xf;
+    pDst->acvi_acwmax = tmp83__ >> 4 & 0xf;
     framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0);
     pBuf += 2;
     ielen -= (tANI_U8)2;
-    tmp78__ = *pBuf;
+    tmp84__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acvo_aifsn = tmp78__ >> 0 & 0xf;
-    pDst->acvo_acm = tmp78__ >> 4 & 0x1;
-    pDst->acvo_aci = tmp78__ >> 5 & 0x3;
-    pDst->unused4 = tmp78__ >> 7 & 0x1;
-    tmp79__ = *pBuf;
+    pDst->acvo_aifsn = tmp84__ >> 0 & 0xf;
+    pDst->acvo_acm = tmp84__ >> 4 & 0x1;
+    pDst->acvo_aci = tmp84__ >> 5 & 0x3;
+    pDst->unused4 = tmp84__ >> 7 & 0x1;
+    tmp85__ = *pBuf;
     pBuf += 1;
     ielen -= 1;
-    pDst->acvo_acwmin = tmp79__ >> 0 & 0xf;
-    pDst->acvo_acwmax = tmp79__ >> 4 & 0xf;
+    pDst->acvo_acwmin = tmp85__ >> 0 & 0xf;
+    pDst->acvo_acwmax = tmp85__ >> 4 & 0xf;
     framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0);
     (void)pCtx;
     return status;
@@ -6325,7 +6397,7 @@ tANI_U32 dot11fUnpackAddTSResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
         {offsetof(tDot11fAssocRequest, P2PIEOpaque), offsetof(tDot11fIEP2PIEOpaque, present), 0, "P2PIEOpaque" , 0, 8, 255, SigIeP2PIEOpaque, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PIEOPAQUE, 0, },
         {offsetof(tDot11fAssocRequest, WFDIEOpaque), offsetof(tDot11fIEWFDIEOpaque, present), 0, "WFDIEOpaque" , 0, 8, 255, SigIeWFDIEOpaque, {80, 111, 154, 10, 0}, 4, DOT11F_EID_WFDIEOPAQUE, 0, },
         {offsetof(tDot11fAssocRequest, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
-        {offsetof(tDot11fAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fAssocRequest, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, },
         {offsetof(tDot11fAssocRequest, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, },
     {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },    };
@@ -6958,11 +7030,30 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("OperatingMode:\n"));
@@ -7025,7 +7116,7 @@ tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
         {offsetof(tDot11fAssocResponse, P2PAssocRes), offsetof(tDot11fIEP2PAssocRes, present), 0, "P2PAssocRes" , 0, 6, 17, SigIeP2PAssocRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PASSOCRES, 0, },
         {offsetof(tDot11fAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fAssocResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
-        {offsetof(tDot11fAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fAssocResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, },
         {offsetof(tDot11fAssocResponse, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, },
     {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },    };
@@ -8149,11 +8240,30 @@ tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -8644,7 +8754,7 @@ tANI_U32 dot11fUnpackAuthentication(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
         {offsetof(tDot11fBeacon, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fBeacon, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
         {offsetof(tDot11fBeacon, VHTExtBssLoad), offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad" , 0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTEXTBSSLOAD, 0, },
-        {offsetof(tDot11fBeacon, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fBeacon, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fBeacon, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, },
         {offsetof(tDot11fBeacon, WiderBWChanSwitchAnn), offsetof(tDot11fIEWiderBWChanSwitchAnn, present), 0, "WiderBWChanSwitchAnn" , 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, },
         {offsetof(tDot11fBeacon, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, },
@@ -9706,11 +9816,30 @@ tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, t
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OperatingMode:\n"));
@@ -9926,7 +10055,7 @@ tANI_U32 dot11fUnpackBeacon1(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf,
         {offsetof(tDot11fBeacon2, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fBeacon2, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
         {offsetof(tDot11fBeacon2, VHTExtBssLoad), offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad" , 0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTEXTBSSLOAD, 0, },
-        {offsetof(tDot11fBeacon2, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fBeacon2, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fBeacon2, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, },
         {offsetof(tDot11fBeacon2, WiderBWChanSwitchAnn), offsetof(tDot11fIEWiderBWChanSwitchAnn, present), 0, "WiderBWChanSwitchAnn" , 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, },
         {offsetof(tDot11fBeacon2, Vendor1IE), offsetof(tDot11fIEVendor1IE, present), 0, "Vendor1IE" , 0, 5, 5, SigIeVendor1IE, {0, 16, 24, 0, 0}, 3, DOT11F_EID_VENDOR1IE, 0, },
@@ -10835,11 +10964,30 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf,
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("OperatingMode:\n"));
@@ -10960,7 +11108,7 @@ tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf,
         {offsetof(tDot11fBeaconIEs, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fBeaconIEs, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
         {offsetof(tDot11fBeaconIEs, VHTExtBssLoad), offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad" , 0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTEXTBSSLOAD, 0, },
-        {offsetof(tDot11fBeaconIEs, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fBeaconIEs, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fBeaconIEs, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, },
         {offsetof(tDot11fBeaconIEs, WiderBWChanSwitchAnn), offsetof(tDot11fIEWiderBWChanSwitchAnn, present), 0, "WiderBWChanSwitchAnn" , 0, 5, 5, SigIeWiderBWChanSwitchAnn, {0, 0, 0, 0, 0}, 0, DOT11F_EID_WIDERBWCHANSWITCHANN, 0, },
         {offsetof(tDot11fBeaconIEs, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, },
@@ -12130,11 +12278,30 @@ tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OperatingMode:\n"));
@@ -14490,7 +14657,7 @@ tANI_U32 dot11fUnpackProbeRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
         {offsetof(tDot11fProbeResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fProbeResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
         {offsetof(tDot11fProbeResponse, VHTExtBssLoad), offsetof(tDot11fIEVHTExtBssLoad, present), 0, "VHTExtBssLoad" , 0, 7, 7, SigIeVHTExtBssLoad, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTEXTBSSLOAD, 0, },
-        {offsetof(tDot11fProbeResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fProbeResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fProbeResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, },
         {offsetof(tDot11fProbeResponse, Vendor1IE), offsetof(tDot11fIEVendor1IE, present), 0, "Vendor1IE" , 0, 5, 5, SigIeVendor1IE, {0, 16, 24, 0, 0}, 3, DOT11F_EID_VENDOR1IE, 0, },
         {offsetof(tDot11fProbeResponse, Vendor2IE), offsetof(tDot11fIEVendor2IE, present), 0, "Vendor2IE" , 0, 5, 5, SigIeVendor2IE, {0, 144, 76, 0, 0}, 3, DOT11F_EID_VENDOR2IE, 0, },
@@ -15627,11 +15794,30 @@ tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -16110,7 +16296,7 @@ tANI_U32 dot11fUnpackRadioMeasurementRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf,
         {offsetof(tDot11fReAssocRequest, P2PIEOpaque), offsetof(tDot11fIEP2PIEOpaque, present), 0, "P2PIEOpaque" , 0, 8, 255, SigIeP2PIEOpaque, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PIEOPAQUE, 0, },
         {offsetof(tDot11fReAssocRequest, WFDIEOpaque), offsetof(tDot11fIEWFDIEOpaque, present), 0, "WFDIEOpaque" , 0, 8, 255, SigIeWFDIEOpaque, {80, 111, 154, 10, 0}, 4, DOT11F_EID_WFDIEOPAQUE, 0, },
         {offsetof(tDot11fReAssocRequest, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
-        {offsetof(tDot11fReAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fReAssocRequest, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fReAssocRequest, OperatingMode), offsetof(tDot11fIEOperatingMode, present), 0, "OperatingMode" , 0, 3, 3, SigIeOperatingMode, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OPERATINGMODE, 0, },
         {offsetof(tDot11fReAssocRequest, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, },
     {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },    };
@@ -17130,11 +17316,30 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("OperatingMode:\n"));
@@ -17198,7 +17403,7 @@ tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32
         {offsetof(tDot11fReAssocResponse, P2PAssocRes), offsetof(tDot11fIEP2PAssocRes, present), 0, "P2PAssocRes" , 0, 6, 17, SigIeP2PAssocRes, {80, 111, 154, 9, 0}, 4, DOT11F_EID_P2PASSOCRES, 0, },
         {offsetof(tDot11fReAssocResponse, VHTCaps), offsetof(tDot11fIEVHTCaps, present), 0, "VHTCaps" , 0, 14, 14, SigIeVHTCaps, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTCAPS, 0, },
         {offsetof(tDot11fReAssocResponse, VHTOperation), offsetof(tDot11fIEVHTOperation, present), 0, "VHTOperation" , 0, 7, 7, SigIeVHTOperation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_VHTOPERATION, 0, },
-        {offsetof(tDot11fReAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fReAssocResponse, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fReAssocResponse, OBSSScanParameters), offsetof(tDot11fIEOBSSScanParameters, present), 0, "OBSSScanParameters" , 0, 16, 16, SigIeOBSSScanParameters, {0, 0, 0, 0, 0}, 0, DOT11F_EID_OBSSSCANPARAMETERS, 0, },
         {offsetof(tDot11fReAssocResponse, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 0, },
     {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },    };
@@ -18329,11 +18534,30 @@ tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U3
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -18535,7 +18759,7 @@ tANI_U32 dot11fUnpackTDLSDisReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBu
         {offsetof(tDot11fTDLSDisRsp, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, },
         {offsetof(tDot11fTDLSDisRsp, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, },
         {offsetof(tDot11fTDLSDisRsp, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, },
-        {offsetof(tDot11fTDLSDisRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fTDLSDisRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fTDLSDisRsp, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, },
         {offsetof(tDot11fTDLSDisRsp, TimeoutInterval), offsetof(tDot11fIETimeoutInterval, present), 0, "TimeoutInterval" , 0, 7, 7, SigIeTimeoutInterval, {0, 0, 0, 0, 0}, 0, DOT11F_EID_TIMEOUTINTERVAL, 0, },
         {offsetof(tDot11fTDLSDisRsp, RICData), offsetof(tDot11fIERICData, present), 0, "RICData" , 0, 6, 6, SigIeRICData, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RICDATA, 0, },
@@ -18690,11 +18914,30 @@ tANI_U32 dot11fUnpackTDLSDisRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBu
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("FTInfo:\n"));
@@ -19268,7 +19511,7 @@ tANI_U32 dot11fUnpackTDLSSetupCnf(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
         {offsetof(tDot11fTDLSSetupReq, ExtSuppRates), offsetof(tDot11fIEExtSuppRates, present), 0, "ExtSuppRates" , 0, 3, 14, SigIeExtSuppRates, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTSUPPRATES, 0, },
         {offsetof(tDot11fTDLSSetupReq, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, },
         {offsetof(tDot11fTDLSSetupReq, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, },
-        {offsetof(tDot11fTDLSSetupReq, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fTDLSSetupReq, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fTDLSSetupReq, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, },
         {offsetof(tDot11fTDLSSetupReq, QOSCapsStation), offsetof(tDot11fIEQOSCapsStation, present), 0, "QOSCapsStation" , 0, 3, 3, SigIeQOSCapsStation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSCAPSSTATION, 0, },
         {offsetof(tDot11fTDLSSetupReq, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, },
@@ -19428,11 +19671,30 @@ tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SuppOperatingClasses:\n"));
@@ -19687,7 +19949,7 @@ tANI_U32 dot11fUnpackTDLSSetupReq(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
         {offsetof(tDot11fTDLSSetupRsp, ExtSuppRates), offsetof(tDot11fIEExtSuppRates, present), 0, "ExtSuppRates" , 0, 3, 14, SigIeExtSuppRates, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTSUPPRATES, 0, },
         {offsetof(tDot11fTDLSSetupRsp, SuppChannels), offsetof(tDot11fIESuppChannels, present), 0, "SuppChannels" , 0, 4, 98, SigIeSuppChannels, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPCHANNELS, 0, },
         {offsetof(tDot11fTDLSSetupRsp, RSN), offsetof(tDot11fIERSN, present), 0, "RSN" , 0, 8, 116, SigIeRSN, {0, 0, 0, 0, 0}, 0, DOT11F_EID_RSN, 0, },
-        {offsetof(tDot11fTDLSSetupRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
+        {offsetof(tDot11fTDLSSetupRsp, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 11, 11, SigIeExtCap, {0, 0, 0, 0, 0}, 0, DOT11F_EID_EXTCAP, 0, },
         {offsetof(tDot11fTDLSSetupRsp, SuppOperatingClasses), offsetof(tDot11fIESuppOperatingClasses, present), 0, "SuppOperatingClasses" , 0, 3, 34, SigIeSuppOperatingClasses, {0, 0, 0, 0, 0}, 0, DOT11F_EID_SUPPOPERATINGCLASSES, 0, },
         {offsetof(tDot11fTDLSSetupRsp, QOSCapsStation), offsetof(tDot11fIEQOSCapsStation, present), 0, "QOSCapsStation" , 0, 3, 3, SigIeQOSCapsStation, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSCAPSSTATION, 0, },
         {offsetof(tDot11fTDLSSetupRsp, FTInfo), offsetof(tDot11fIEFTInfo, present), 0, "FTInfo" , 0, 84, 222, SigIeFTInfo, {0, 0, 0, 0, 0}, 0, DOT11F_EID_FTINFO, 0, },
@@ -19850,11 +20112,30 @@ tANI_U32 dot11fUnpackTDLSSetupRsp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 n
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SuppOperatingClasses:\n"));
@@ -23242,7 +23523,7 @@ static tANI_U32 GetPackedSizeCore(tpAniSirGlobal pCtx,
                             break;
                 case SigIeExtCap:
                             offset = sizeof(tDot11fIEExtCap);
-                            byteCount = 8;
+                            byteCount = 9;
                             pIePresent = ( (tDot11fIEExtCap* )(pFrm + pIe->offset + offset * i  ))->present;
                             break;
                 case SigIeExtChanSwitchAnn:
@@ -23877,13 +24158,13 @@ void dot11fPackFfAddBAParameterSet(tpAniSirGlobal pCtx,
                                    tDot11fFfAddBAParameterSet *pSrc,
                                    tANI_U8 *pBuf)
 {
-    tANI_U16 tmp80__;
-    tmp80__ = 0U;
-    tmp80__ |= ( pSrc->amsduSupported << 0 );
-    tmp80__ |= ( pSrc->policy << 1 );
-    tmp80__ |= ( pSrc->tid << 2 );
-    tmp80__ |= ( pSrc->bufferSize << 6 );
-    frameshtons(pCtx, pBuf, tmp80__, 0);
+    tANI_U16 tmp86__;
+    tmp86__ = 0U;
+    tmp86__ |= ( pSrc->amsduSupported << 0 );
+    tmp86__ |= ( pSrc->policy << 1 );
+    tmp86__ |= ( pSrc->tid << 2 );
+    tmp86__ |= ( pSrc->bufferSize << 6 );
+    frameshtons(pCtx, pBuf, tmp86__, 0);
     (void)pCtx;
 } /* End dot11fPackFfAddBAParameterSet. */
 
@@ -23907,11 +24188,11 @@ void dot11fPackFfBAStartingSequenceControl(tpAniSirGlobal pCtx,
                                            tDot11fFfBAStartingSequenceControl *pSrc,
                                            tANI_U8 *pBuf)
 {
-    tANI_U16 tmp81__;
-    tmp81__ = 0U;
-    tmp81__ |= ( pSrc->fragNumber << 0 );
-    tmp81__ |= ( pSrc->ssn << 4 );
-    frameshtons(pCtx, pBuf, tmp81__, 0);
+    tANI_U16 tmp87__;
+    tmp87__ = 0U;
+    tmp87__ |= ( pSrc->fragNumber << 0 );
+    tmp87__ |= ( pSrc->ssn << 4 );
+    frameshtons(pCtx, pBuf, tmp87__, 0);
     (void)pCtx;
 } /* End dot11fPackFfBAStartingSequenceControl. */
 
@@ -23935,25 +24216,25 @@ void dot11fPackFfCapabilities(tpAniSirGlobal pCtx,
                               tDot11fFfCapabilities *pSrc,
                               tANI_U8 *pBuf)
 {
-    tANI_U16 tmp82__;
-    tmp82__ = 0U;
-    tmp82__ |= ( pSrc->ess << 0 );
-    tmp82__ |= ( pSrc->ibss << 1 );
-    tmp82__ |= ( pSrc->cfPollable << 2 );
-    tmp82__ |= ( pSrc->cfPollReq << 3 );
-    tmp82__ |= ( pSrc->privacy << 4 );
-    tmp82__ |= ( pSrc->shortPreamble << 5 );
-    tmp82__ |= ( pSrc->pbcc << 6 );
-    tmp82__ |= ( pSrc->channelAgility << 7 );
-    tmp82__ |= ( pSrc->spectrumMgt << 8 );
-    tmp82__ |= ( pSrc->qos << 9 );
-    tmp82__ |= ( pSrc->shortSlotTime << 10 );
-    tmp82__ |= ( pSrc->apsd << 11 );
-    tmp82__ |= ( pSrc->rrm << 12 );
-    tmp82__ |= ( pSrc->dsssOfdm << 13 );
-    tmp82__ |= ( pSrc->delayedBA << 14 );
-    tmp82__ |= ( pSrc->immediateBA << 15 );
-    frameshtons(pCtx, pBuf, tmp82__, 0);
+    tANI_U16 tmp88__;
+    tmp88__ = 0U;
+    tmp88__ |= ( pSrc->ess << 0 );
+    tmp88__ |= ( pSrc->ibss << 1 );
+    tmp88__ |= ( pSrc->cfPollable << 2 );
+    tmp88__ |= ( pSrc->cfPollReq << 3 );
+    tmp88__ |= ( pSrc->privacy << 4 );
+    tmp88__ |= ( pSrc->shortPreamble << 5 );
+    tmp88__ |= ( pSrc->pbcc << 6 );
+    tmp88__ |= ( pSrc->channelAgility << 7 );
+    tmp88__ |= ( pSrc->spectrumMgt << 8 );
+    tmp88__ |= ( pSrc->qos << 9 );
+    tmp88__ |= ( pSrc->shortSlotTime << 10 );
+    tmp88__ |= ( pSrc->apsd << 11 );
+    tmp88__ |= ( pSrc->rrm << 12 );
+    tmp88__ |= ( pSrc->dsssOfdm << 13 );
+    tmp88__ |= ( pSrc->delayedBA << 14 );
+    tmp88__ |= ( pSrc->immediateBA << 15 );
+    frameshtons(pCtx, pBuf, tmp88__, 0);
     (void)pCtx;
 } /* End dot11fPackFfCapabilities. */
 
@@ -23977,12 +24258,12 @@ void dot11fPackFfDelBAParameterSet(tpAniSirGlobal pCtx,
                                    tDot11fFfDelBAParameterSet *pSrc,
                                    tANI_U8 *pBuf)
 {
-    tANI_U16 tmp83__;
-    tmp83__ = 0U;
-    tmp83__ |= ( pSrc->reserved << 0 );
-    tmp83__ |= ( pSrc->initiator << 11 );
-    tmp83__ |= ( pSrc->tid << 12 );
-    frameshtons(pCtx, pBuf, tmp83__, 0);
+    tANI_U16 tmp89__;
+    tmp89__ = 0U;
+    tmp89__ |= ( pSrc->reserved << 0 );
+    tmp89__ |= ( pSrc->initiator << 11 );
+    tmp89__ |= ( pSrc->tid << 12 );
+    frameshtons(pCtx, pBuf, tmp89__, 0);
     (void)pCtx;
 } /* End dot11fPackFfDelBAParameterSet. */
 
@@ -24030,13 +24311,13 @@ void dot11fPackFfOperatingMode(tpAniSirGlobal pCtx,
                                tDot11fFfOperatingMode *pSrc,
                                tANI_U8 *pBuf)
 {
-    tANI_U8 tmp84__;
-    tmp84__ = 0U;
-    tmp84__ |= ( pSrc->chanWidth << 0 );
-    tmp84__ |= ( pSrc->reserved << 2 );
-    tmp84__ |= ( pSrc->rxNSS << 4 );
-    tmp84__ |= ( pSrc->rxNSSType << 7 );
-    *pBuf = tmp84__;
+    tANI_U8 tmp90__;
+    tmp90__ = 0U;
+    tmp90__ |= ( pSrc->chanWidth << 0 );
+    tmp90__ |= ( pSrc->reserved << 2 );
+    tmp90__ |= ( pSrc->rxNSS << 4 );
+    tmp90__ |= ( pSrc->rxNSSType << 7 );
+    *pBuf = tmp90__;
     (void)pCtx;
 } /* End dot11fPackFfOperatingMode. */
 
@@ -24092,12 +24373,12 @@ void dot11fPackFfSMPowerModeSet(tpAniSirGlobal pCtx,
                                 tDot11fFfSMPowerModeSet *pSrc,
                                 tANI_U8 *pBuf)
 {
-    tANI_U8 tmp85__;
-    tmp85__ = 0U;
-    tmp85__ |= ( pSrc->PowerSave_En << 0 );
-    tmp85__ |= ( pSrc->Mode << 1 );
-    tmp85__ |= ( pSrc->reserved << 2 );
-    *pBuf = tmp85__;
+    tANI_U8 tmp91__;
+    tmp91__ = 0U;
+    tmp91__ |= ( pSrc->PowerSave_En << 0 );
+    tmp91__ |= ( pSrc->Mode << 1 );
+    tmp91__ |= ( pSrc->reserved << 2 );
+    *pBuf = tmp91__;
     (void)pCtx;
 } /* End dot11fPackFfSMPowerModeSet. */
 
@@ -24137,19 +24418,19 @@ void dot11fPackFfTSInfo(tpAniSirGlobal pCtx,
                         tDot11fFfTSInfo *pSrc,
                         tANI_U8 *pBuf)
 {
-    tANI_U32 tmp86__;
-    tmp86__ = 0U;
-    tmp86__ |= ( pSrc->traffic_type << 0 );
-    tmp86__ |= ( pSrc->tsid << 1 );
-    tmp86__ |= ( pSrc->direction << 5 );
-    tmp86__ |= ( pSrc->access_policy << 7 );
-    tmp86__ |= ( pSrc->aggregation << 9 );
-    tmp86__ |= ( pSrc->psb << 10 );
-    tmp86__ |= ( pSrc->user_priority << 11 );
-    tmp86__ |= ( pSrc->tsinfo_ack_pol << 14 );
-    tmp86__ |= ( pSrc->schedule << 16 );
-    tmp86__ |= ( pSrc->unused << 17 );
-    frameshtonl(pCtx, pBuf, tmp86__, 0);
+    tANI_U32 tmp92__;
+    tmp92__ = 0U;
+    tmp92__ |= ( pSrc->traffic_type << 0 );
+    tmp92__ |= ( pSrc->tsid << 1 );
+    tmp92__ |= ( pSrc->direction << 5 );
+    tmp92__ |= ( pSrc->access_policy << 7 );
+    tmp92__ |= ( pSrc->aggregation << 9 );
+    tmp92__ |= ( pSrc->psb << 10 );
+    tmp92__ |= ( pSrc->user_priority << 11 );
+    tmp92__ |= ( pSrc->tsinfo_ack_pol << 14 );
+    tmp92__ |= ( pSrc->schedule << 16 );
+    tmp92__ |= ( pSrc->unused << 17 );
+    frameshtonl(pCtx, pBuf, tmp92__, 0);
     (void)pCtx;
 } /* End dot11fPackFfTSInfo. */
 
@@ -24270,7 +24551,7 @@ tANI_U32 dot11fPackTlvVersion2(tpAniSirGlobal pCtx,
     tANI_U8* pTlvLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp87__;
+    tANI_U8 tmp93__;
     nNeeded += 3;
     if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW;
     while ( pSrc->present )
@@ -24279,10 +24560,10 @@ tANI_U32 dot11fPackTlvVersion2(tpAniSirGlobal pCtx,
         pBuf += 1; *pnConsumed += 1;
         pTlvLen = pBuf;
         pBuf += 1; *pnConsumed += 1;
-        tmp87__ = 0U;
-        tmp87__ |= ( pSrc->minor << 0 );
-        tmp87__ |= ( pSrc->major << 4 );
-        *pBuf = tmp87__;
+        tmp93__ = 0U;
+        tmp93__ |= ( pSrc->minor << 0 );
+        tmp93__ |= ( pSrc->major << 4 );
+        *pBuf = tmp93__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -25491,7 +25772,7 @@ tANI_U32 dot11fPackTlvVersion(tpAniSirGlobal pCtx,
     tANI_U8* pTlvLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp88__;
+    tANI_U8 tmp94__;
     nNeeded += 5;
     if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW;
     while ( pSrc->present )
@@ -25500,10 +25781,10 @@ tANI_U32 dot11fPackTlvVersion(tpAniSirGlobal pCtx,
         pBuf += 2; *pnConsumed += 2;
         pTlvLen = pBuf;
         pBuf += 2; *pnConsumed += 2;
-        tmp88__ = 0U;
-        tmp88__ |= ( pSrc->minor << 0 );
-        tmp88__ |= ( pSrc->major << 4 );
-        *pBuf = tmp88__;
+        tmp94__ = 0U;
+        tmp94__ |= ( pSrc->minor << 0 );
+        tmp94__ |= ( pSrc->major << 4 );
+        *pBuf = tmp94__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -25709,7 +25990,7 @@ tANI_U32 dot11fPackIeGTK(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp89__;
+    tANI_U16 tmp95__;
     nNeeded  +=  (pSrc->num_key + 11);
     while ( pSrc->present )
     {
@@ -25718,10 +25999,10 @@ tANI_U32 dot11fPackIeGTK(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp89__ = 0U;
-        tmp89__ |= ( pSrc->keyId << 0 );
-        tmp89__ |= ( pSrc->reserved << 2 );
-        frameshtons(pCtx, pBuf, tmp89__, 0);
+        tmp95__ = 0U;
+        tmp95__ |= ( pSrc->keyId << 0 );
+        tmp95__ |= ( pSrc->reserved << 2 );
+        frameshtons(pCtx, pBuf, tmp95__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -26017,14 +26298,14 @@ tANI_U32 dot11fPackIePropEDCAParams(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp90__;
-    tANI_U8 tmp91__;
-    tANI_U8 tmp92__;
-    tANI_U8 tmp93__;
-    tANI_U8 tmp94__;
-    tANI_U8 tmp95__;
     tANI_U8 tmp96__;
     tANI_U8 tmp97__;
+    tANI_U8 tmp98__;
+    tANI_U8 tmp99__;
+    tANI_U8 tmp100__;
+    tANI_U8 tmp101__;
+    tANI_U8 tmp102__;
+    tANI_U8 tmp103__;
     nNeeded  += 18;
     while ( pSrc->present )
     {
@@ -26039,76 +26320,76 @@ tANI_U32 dot11fPackIePropEDCAParams(tpAniSirGlobal pCtx,
         *pBuf = pSrc->reserved;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp90__ = 0U;
-        tmp90__ |= ( pSrc->acbe_aifsn << 0 );
-        tmp90__ |= ( pSrc->acbe_acm << 4 );
-        tmp90__ |= ( pSrc->acbe_aci << 5 );
-        tmp90__ |= ( pSrc->unused1 << 7 );
-        *pBuf = tmp90__;
+        tmp96__ = 0U;
+        tmp96__ |= ( pSrc->acbe_aifsn << 0 );
+        tmp96__ |= ( pSrc->acbe_acm << 4 );
+        tmp96__ |= ( pSrc->acbe_aci << 5 );
+        tmp96__ |= ( pSrc->unused1 << 7 );
+        *pBuf = tmp96__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp91__ = 0U;
-        tmp91__ |= ( pSrc->acbe_min << 0 );
-        tmp91__ |= ( pSrc->acbe_max << 4 );
-        *pBuf = tmp91__;
+        tmp97__ = 0U;
+        tmp97__ |= ( pSrc->acbe_min << 0 );
+        tmp97__ |= ( pSrc->acbe_max << 4 );
+        *pBuf = tmp97__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp92__ = 0U;
-        tmp92__ |= ( pSrc->acbk_aifsn << 0 );
-        tmp92__ |= ( pSrc->acbk_acm << 4 );
-        tmp92__ |= ( pSrc->acbk_aci << 5 );
-        tmp92__ |= ( pSrc->unused2 << 7 );
-        *pBuf = tmp92__;
+        tmp98__ = 0U;
+        tmp98__ |= ( pSrc->acbk_aifsn << 0 );
+        tmp98__ |= ( pSrc->acbk_acm << 4 );
+        tmp98__ |= ( pSrc->acbk_aci << 5 );
+        tmp98__ |= ( pSrc->unused2 << 7 );
+        *pBuf = tmp98__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp93__ = 0U;
-        tmp93__ |= ( pSrc->acbk_min << 0 );
-        tmp93__ |= ( pSrc->acbk_max << 4 );
-        *pBuf = tmp93__;
+        tmp99__ = 0U;
+        tmp99__ |= ( pSrc->acbk_min << 0 );
+        tmp99__ |= ( pSrc->acbk_max << 4 );
+        *pBuf = tmp99__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp94__ = 0U;
-        tmp94__ |= ( pSrc->acvi_aifsn << 0 );
-        tmp94__ |= ( pSrc->acvi_acm << 4 );
-        tmp94__ |= ( pSrc->acvi_aci << 5 );
-        tmp94__ |= ( pSrc->unused3 << 7 );
-        *pBuf = tmp94__;
+        tmp100__ = 0U;
+        tmp100__ |= ( pSrc->acvi_aifsn << 0 );
+        tmp100__ |= ( pSrc->acvi_acm << 4 );
+        tmp100__ |= ( pSrc->acvi_aci << 5 );
+        tmp100__ |= ( pSrc->unused3 << 7 );
+        *pBuf = tmp100__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp95__ = 0U;
-        tmp95__ |= ( pSrc->acvi_min << 0 );
-        tmp95__ |= ( pSrc->acvi_max << 4 );
-        *pBuf = tmp95__;
+        tmp101__ = 0U;
+        tmp101__ |= ( pSrc->acvi_min << 0 );
+        tmp101__ |= ( pSrc->acvi_max << 4 );
+        *pBuf = tmp101__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp96__ = 0U;
-        tmp96__ |= ( pSrc->acvo_aifsn << 0 );
-        tmp96__ |= ( pSrc->acvo_acm << 4 );
-        tmp96__ |= ( pSrc->acvo_aci << 5 );
-        tmp96__ |= ( pSrc->unused4 << 7 );
-        *pBuf = tmp96__;
+        tmp102__ = 0U;
+        tmp102__ |= ( pSrc->acvo_aifsn << 0 );
+        tmp102__ |= ( pSrc->acvo_acm << 4 );
+        tmp102__ |= ( pSrc->acvo_aci << 5 );
+        tmp102__ |= ( pSrc->unused4 << 7 );
+        *pBuf = tmp102__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp97__ = 0U;
-        tmp97__ |= ( pSrc->acvo_min << 0 );
-        tmp97__ |= ( pSrc->acvo_max << 4 );
-        *pBuf = tmp97__;
+        tmp103__ = 0U;
+        tmp103__ |= ( pSrc->acvo_min << 0 );
+        tmp103__ |= ( pSrc->acvo_max << 4 );
+        *pBuf = tmp103__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -26296,7 +26577,7 @@ tANI_U32 dot11fPackIeTaurus(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp98__;
+    tANI_U16 tmp104__;
     nNeeded  += 6;
     while ( pSrc->present )
     {
@@ -26311,10 +26592,10 @@ tANI_U32 dot11fPackIeTaurus(tpAniSirGlobal pCtx,
         frameshtons(pCtx, pBuf, pSrc->baPolicy, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp98__ = 0U;
-        tmp98__ |= ( pSrc->baBufferSize << 0 );
-        tmp98__ |= ( pSrc->rsvd << 12 );
-        frameshtons(pCtx, pBuf, tmp98__, 0);
+        tmp104__ = 0U;
+        tmp104__ |= ( pSrc->baBufferSize << 0 );
+        tmp104__ |= ( pSrc->rsvd << 12 );
+        frameshtons(pCtx, pBuf, tmp104__, 0);
         *pnConsumed += 2;
         // fieldsEndFlag  = 1
         nBuf -=  2 ;
@@ -26733,11 +27014,11 @@ tANI_U32 dot11fPackIeRRMEnabledCap(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp99__;
-    tANI_U8 tmp100__;
-    tANI_U8 tmp101__;
-    tANI_U8 tmp102__;
-    tANI_U8 tmp103__;
+    tANI_U8 tmp105__;
+    tANI_U8 tmp106__;
+    tANI_U8 tmp107__;
+    tANI_U8 tmp108__;
+    tANI_U8 tmp109__;
     nNeeded  += 5;
     while ( pSrc->present )
     {
@@ -26746,57 +27027,57 @@ tANI_U32 dot11fPackIeRRMEnabledCap(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp99__ = 0U;
-        tmp99__ |= ( pSrc->LinkMeasurement << 0 );
-        tmp99__ |= ( pSrc->NeighborRpt << 1 );
-        tmp99__ |= ( pSrc->parallel << 2 );
-        tmp99__ |= ( pSrc->repeated << 3 );
-        tmp99__ |= ( pSrc->BeaconPassive << 4 );
-        tmp99__ |= ( pSrc->BeaconActive << 5 );
-        tmp99__ |= ( pSrc->BeaconTable << 6 );
-        tmp99__ |= ( pSrc->BeaconRepCond << 7 );
-        *pBuf = tmp99__;
+        tmp105__ = 0U;
+        tmp105__ |= ( pSrc->LinkMeasurement << 0 );
+        tmp105__ |= ( pSrc->NeighborRpt << 1 );
+        tmp105__ |= ( pSrc->parallel << 2 );
+        tmp105__ |= ( pSrc->repeated << 3 );
+        tmp105__ |= ( pSrc->BeaconPassive << 4 );
+        tmp105__ |= ( pSrc->BeaconActive << 5 );
+        tmp105__ |= ( pSrc->BeaconTable << 6 );
+        tmp105__ |= ( pSrc->BeaconRepCond << 7 );
+        *pBuf = tmp105__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp100__ = 0U;
-        tmp100__ |= ( pSrc->FrameMeasurement << 0 );
-        tmp100__ |= ( pSrc->ChannelLoad << 1 );
-        tmp100__ |= ( pSrc->NoiseHistogram << 2 );
-        tmp100__ |= ( pSrc->statistics << 3 );
-        tmp100__ |= ( pSrc->LCIMeasurement << 4 );
-        tmp100__ |= ( pSrc->LCIAzimuth << 5 );
-        tmp100__ |= ( pSrc->TCMCapability << 6 );
-        tmp100__ |= ( pSrc->triggeredTCM << 7 );
-        *pBuf = tmp100__;
+        tmp106__ = 0U;
+        tmp106__ |= ( pSrc->FrameMeasurement << 0 );
+        tmp106__ |= ( pSrc->ChannelLoad << 1 );
+        tmp106__ |= ( pSrc->NoiseHistogram << 2 );
+        tmp106__ |= ( pSrc->statistics << 3 );
+        tmp106__ |= ( pSrc->LCIMeasurement << 4 );
+        tmp106__ |= ( pSrc->LCIAzimuth << 5 );
+        tmp106__ |= ( pSrc->TCMCapability << 6 );
+        tmp106__ |= ( pSrc->triggeredTCM << 7 );
+        *pBuf = tmp106__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp101__ = 0U;
-        tmp101__ |= ( pSrc->APChanReport << 0 );
-        tmp101__ |= ( pSrc->RRMMIBEnabled << 1 );
-        tmp101__ |= ( pSrc->operatingChanMax << 2 );
-        tmp101__ |= ( pSrc->nonOperatinChanMax << 5 );
-        *pBuf = tmp101__;
+        tmp107__ = 0U;
+        tmp107__ |= ( pSrc->APChanReport << 0 );
+        tmp107__ |= ( pSrc->RRMMIBEnabled << 1 );
+        tmp107__ |= ( pSrc->operatingChanMax << 2 );
+        tmp107__ |= ( pSrc->nonOperatinChanMax << 5 );
+        *pBuf = tmp107__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp102__ = 0U;
-        tmp102__ |= ( pSrc->MeasurementPilot << 0 );
-        tmp102__ |= ( pSrc->MeasurementPilotEnabled << 3 );
-        tmp102__ |= ( pSrc->NeighborTSFOffset << 4 );
-        tmp102__ |= ( pSrc->RCPIMeasurement << 5 );
-        tmp102__ |= ( pSrc->RSNIMeasurement << 6 );
-        tmp102__ |= ( pSrc->BssAvgAccessDelay << 7 );
-        *pBuf = tmp102__;
+        tmp108__ = 0U;
+        tmp108__ |= ( pSrc->MeasurementPilot << 0 );
+        tmp108__ |= ( pSrc->MeasurementPilotEnabled << 3 );
+        tmp108__ |= ( pSrc->NeighborTSFOffset << 4 );
+        tmp108__ |= ( pSrc->RCPIMeasurement << 5 );
+        tmp108__ |= ( pSrc->RSNIMeasurement << 6 );
+        tmp108__ |= ( pSrc->BssAvgAccessDelay << 7 );
+        *pBuf = tmp108__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp103__ = 0U;
-        tmp103__ |= ( pSrc->BSSAvailAdmission << 0 );
-        tmp103__ |= ( pSrc->AntennaInformation << 1 );
-        tmp103__ |= ( pSrc->reserved << 2 );
-        *pBuf = tmp103__;
+        tmp109__ = 0U;
+        tmp109__ |= ( pSrc->BSSAvailAdmission << 0 );
+        tmp109__ |= ( pSrc->AntennaInformation << 1 );
+        tmp109__ |= ( pSrc->reserved << 2 );
+        *pBuf = tmp109__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -26879,7 +27160,7 @@ tANI_U32 dot11fPackIeSchedule(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp104__;
+    tANI_U16 tmp110__;
     nNeeded  += 14;
     while ( pSrc->present )
     {
@@ -26888,12 +27169,12 @@ tANI_U32 dot11fPackIeSchedule(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp104__ = 0U;
-        tmp104__ |= ( pSrc->aggregation << 0 );
-        tmp104__ |= ( pSrc->tsid << 1 );
-        tmp104__ |= ( pSrc->direction << 5 );
-        tmp104__ |= ( pSrc->reserved << 7 );
-        frameshtons(pCtx, pBuf, tmp104__, 0);
+        tmp110__ = 0U;
+        tmp110__ |= ( pSrc->aggregation << 0 );
+        tmp110__ |= ( pSrc->tsid << 1 );
+        tmp110__ |= ( pSrc->direction << 5 );
+        tmp110__ |= ( pSrc->reserved << 7 );
+        frameshtons(pCtx, pBuf, tmp110__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -27093,9 +27374,9 @@ tANI_U32 dot11fPackIeTSPEC(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp105__;
-    tANI_U8 tmp106__;
-    tANI_U16 tmp107__;
+    tANI_U16 tmp111__;
+    tANI_U8 tmp112__;
+    tANI_U16 tmp113__;
     nNeeded  += 55;
     while ( pSrc->present )
     {
@@ -27104,30 +27385,30 @@ tANI_U32 dot11fPackIeTSPEC(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp105__ = 0U;
-        tmp105__ |= ( pSrc->traffic_type << 0 );
-        tmp105__ |= ( pSrc->tsid << 1 );
-        tmp105__ |= ( pSrc->direction << 5 );
-        tmp105__ |= ( pSrc->access_policy << 7 );
-        tmp105__ |= ( pSrc->aggregation << 9 );
-        tmp105__ |= ( pSrc->psb << 10 );
-        tmp105__ |= ( pSrc->user_priority << 11 );
-        tmp105__ |= ( pSrc->tsinfo_ack_pol << 14 );
-        frameshtons(pCtx, pBuf, tmp105__, 0);
+        tmp111__ = 0U;
+        tmp111__ |= ( pSrc->traffic_type << 0 );
+        tmp111__ |= ( pSrc->tsid << 1 );
+        tmp111__ |= ( pSrc->direction << 5 );
+        tmp111__ |= ( pSrc->access_policy << 7 );
+        tmp111__ |= ( pSrc->aggregation << 9 );
+        tmp111__ |= ( pSrc->psb << 10 );
+        tmp111__ |= ( pSrc->user_priority << 11 );
+        tmp111__ |= ( pSrc->tsinfo_ack_pol << 14 );
+        frameshtons(pCtx, pBuf, tmp111__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
-        tmp106__ = 0U;
-        tmp106__ |= ( pSrc->schedule << 0 );
-        tmp106__ |= ( pSrc->unused << 1 );
-        *pBuf = tmp106__;
+        tmp112__ = 0U;
+        tmp112__ |= ( pSrc->schedule << 0 );
+        tmp112__ |= ( pSrc->unused << 1 );
+        *pBuf = tmp112__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp107__ = 0U;
-        tmp107__ |= ( pSrc->size << 0 );
-        tmp107__ |= ( pSrc->fixed << 15 );
-        frameshtons(pCtx, pBuf, tmp107__, 0);
+        tmp113__ = 0U;
+        tmp113__ |= ( pSrc->size << 0 );
+        tmp113__ |= ( pSrc->fixed << 15 );
+        frameshtons(pCtx, pBuf, tmp113__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -27192,7 +27473,7 @@ tANI_U32 dot11fPackIeWMMSchedule(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp108__;
+    tANI_U16 tmp114__;
     nNeeded  += 15;
     while ( pSrc->present )
     {
@@ -27214,12 +27495,12 @@ tANI_U32 dot11fPackIeWMMSchedule(tpAniSirGlobal pCtx,
         *pBuf = pSrc->version;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp108__ = 0U;
-        tmp108__ |= ( pSrc->aggregation << 0 );
-        tmp108__ |= ( pSrc->tsid << 1 );
-        tmp108__ |= ( pSrc->direction << 5 );
-        tmp108__ |= ( pSrc->reserved << 7 );
-        frameshtons(pCtx, pBuf, tmp108__, 0);
+        tmp114__ = 0U;
+        tmp114__ |= ( pSrc->aggregation << 0 );
+        tmp114__ |= ( pSrc->tsid << 1 );
+        tmp114__ |= ( pSrc->direction << 5 );
+        tmp114__ |= ( pSrc->reserved << 7 );
+        frameshtons(pCtx, pBuf, tmp114__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -27458,9 +27739,9 @@ tANI_U32 dot11fPackIeWMMTSPEC(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp109__;
-    tANI_U8 tmp110__;
-    tANI_U16 tmp111__;
+    tANI_U16 tmp115__;
+    tANI_U8 tmp116__;
+    tANI_U16 tmp117__;
     nNeeded  += 38;
     while ( pSrc->present )
     {
@@ -27482,30 +27763,30 @@ tANI_U32 dot11fPackIeWMMTSPEC(tpAniSirGlobal pCtx,
         *pBuf = pSrc->version;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp109__ = 0U;
-        tmp109__ |= ( pSrc->traffic_type << 0 );
-        tmp109__ |= ( pSrc->tsid << 1 );
-        tmp109__ |= ( pSrc->direction << 5 );
-        tmp109__ |= ( pSrc->access_policy << 7 );
-        tmp109__ |= ( pSrc->aggregation << 9 );
-        tmp109__ |= ( pSrc->psb << 10 );
-        tmp109__ |= ( pSrc->user_priority << 11 );
-        tmp109__ |= ( pSrc->tsinfo_ack_pol << 14 );
-        frameshtons(pCtx, pBuf, tmp109__, 0);
+        tmp115__ = 0U;
+        tmp115__ |= ( pSrc->traffic_type << 0 );
+        tmp115__ |= ( pSrc->tsid << 1 );
+        tmp115__ |= ( pSrc->direction << 5 );
+        tmp115__ |= ( pSrc->access_policy << 7 );
+        tmp115__ |= ( pSrc->aggregation << 9 );
+        tmp115__ |= ( pSrc->psb << 10 );
+        tmp115__ |= ( pSrc->user_priority << 11 );
+        tmp115__ |= ( pSrc->tsinfo_ack_pol << 14 );
+        frameshtons(pCtx, pBuf, tmp115__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
-        tmp110__ = 0U;
-        tmp110__ |= ( pSrc->tsinfo_rsvd << 0 );
-        tmp110__ |= ( pSrc->burst_size_defn << 7 );
-        *pBuf = tmp110__;
+        tmp116__ = 0U;
+        tmp116__ |= ( pSrc->tsinfo_rsvd << 0 );
+        tmp116__ |= ( pSrc->burst_size_defn << 7 );
+        *pBuf = tmp116__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp111__ = 0U;
-        tmp111__ |= ( pSrc->size << 0 );
-        tmp111__ |= ( pSrc->fixed << 15 );
-        frameshtons(pCtx, pBuf, tmp111__, 0);
+        tmp117__ = 0U;
+        tmp117__ |= ( pSrc->size << 0 );
+        tmp117__ |= ( pSrc->fixed << 15 );
+        frameshtons(pCtx, pBuf, tmp117__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -27887,14 +28168,14 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp112__;
-    tANI_U8 tmp113__;
-    tANI_U8 tmp114__;
-    tANI_U8 tmp115__;
-    tANI_U8 tmp116__;
-    tANI_U8 tmp117__;
     tANI_U8 tmp118__;
     tANI_U8 tmp119__;
+    tANI_U8 tmp120__;
+    tANI_U8 tmp121__;
+    tANI_U8 tmp122__;
+    tANI_U8 tmp123__;
+    tANI_U8 tmp124__;
+    tANI_U8 tmp125__;
     nNeeded  += 18;
     while ( pSrc->present )
     {
@@ -27909,76 +28190,76 @@ tANI_U32 dot11fPackIeEDCAParamSet(tpAniSirGlobal pCtx,
         *pBuf = pSrc->reserved;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp112__ = 0U;
-        tmp112__ |= ( pSrc->acbe_aifsn << 0 );
-        tmp112__ |= ( pSrc->acbe_acm << 4 );
-        tmp112__ |= ( pSrc->acbe_aci << 5 );
-        tmp112__ |= ( pSrc->unused1 << 7 );
-        *pBuf = tmp112__;
+        tmp118__ = 0U;
+        tmp118__ |= ( pSrc->acbe_aifsn << 0 );
+        tmp118__ |= ( pSrc->acbe_acm << 4 );
+        tmp118__ |= ( pSrc->acbe_aci << 5 );
+        tmp118__ |= ( pSrc->unused1 << 7 );
+        *pBuf = tmp118__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp113__ = 0U;
-        tmp113__ |= ( pSrc->acbe_acwmin << 0 );
-        tmp113__ |= ( pSrc->acbe_acwmax << 4 );
-        *pBuf = tmp113__;
+        tmp119__ = 0U;
+        tmp119__ |= ( pSrc->acbe_acwmin << 0 );
+        tmp119__ |= ( pSrc->acbe_acwmax << 4 );
+        *pBuf = tmp119__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp114__ = 0U;
-        tmp114__ |= ( pSrc->acbk_aifsn << 0 );
-        tmp114__ |= ( pSrc->acbk_acm << 4 );
-        tmp114__ |= ( pSrc->acbk_aci << 5 );
-        tmp114__ |= ( pSrc->unused2 << 7 );
-        *pBuf = tmp114__;
+        tmp120__ = 0U;
+        tmp120__ |= ( pSrc->acbk_aifsn << 0 );
+        tmp120__ |= ( pSrc->acbk_acm << 4 );
+        tmp120__ |= ( pSrc->acbk_aci << 5 );
+        tmp120__ |= ( pSrc->unused2 << 7 );
+        *pBuf = tmp120__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp115__ = 0U;
-        tmp115__ |= ( pSrc->acbk_acwmin << 0 );
-        tmp115__ |= ( pSrc->acbk_acwmax << 4 );
-        *pBuf = tmp115__;
+        tmp121__ = 0U;
+        tmp121__ |= ( pSrc->acbk_acwmin << 0 );
+        tmp121__ |= ( pSrc->acbk_acwmax << 4 );
+        *pBuf = tmp121__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp116__ = 0U;
-        tmp116__ |= ( pSrc->acvi_aifsn << 0 );
-        tmp116__ |= ( pSrc->acvi_acm << 4 );
-        tmp116__ |= ( pSrc->acvi_aci << 5 );
-        tmp116__ |= ( pSrc->unused3 << 7 );
-        *pBuf = tmp116__;
+        tmp122__ = 0U;
+        tmp122__ |= ( pSrc->acvi_aifsn << 0 );
+        tmp122__ |= ( pSrc->acvi_acm << 4 );
+        tmp122__ |= ( pSrc->acvi_aci << 5 );
+        tmp122__ |= ( pSrc->unused3 << 7 );
+        *pBuf = tmp122__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp117__ = 0U;
-        tmp117__ |= ( pSrc->acvi_acwmin << 0 );
-        tmp117__ |= ( pSrc->acvi_acwmax << 4 );
-        *pBuf = tmp117__;
+        tmp123__ = 0U;
+        tmp123__ |= ( pSrc->acvi_acwmin << 0 );
+        tmp123__ |= ( pSrc->acvi_acwmax << 4 );
+        *pBuf = tmp123__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp118__ = 0U;
-        tmp118__ |= ( pSrc->acvo_aifsn << 0 );
-        tmp118__ |= ( pSrc->acvo_acm << 4 );
-        tmp118__ |= ( pSrc->acvo_aci << 5 );
-        tmp118__ |= ( pSrc->unused4 << 7 );
-        *pBuf = tmp118__;
+        tmp124__ = 0U;
+        tmp124__ |= ( pSrc->acvo_aifsn << 0 );
+        tmp124__ |= ( pSrc->acvo_acm << 4 );
+        tmp124__ |= ( pSrc->acvo_aci << 5 );
+        tmp124__ |= ( pSrc->unused4 << 7 );
+        *pBuf = tmp124__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp119__ = 0U;
-        tmp119__ |= ( pSrc->acvo_acwmin << 0 );
-        tmp119__ |= ( pSrc->acvo_acwmax << 4 );
-        *pBuf = tmp119__;
+        tmp125__ = 0U;
+        tmp125__ |= ( pSrc->acvo_acwmin << 0 );
+        tmp125__ |= ( pSrc->acvo_acwmax << 4 );
+        *pBuf = tmp125__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -28004,7 +28285,7 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp120__;
+    tANI_U8 tmp126__;
     nNeeded  += 1;
     while ( pSrc->present )
     {
@@ -28013,12 +28294,12 @@ tANI_U32 dot11fPackIeERPInfo(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp120__ = 0U;
-        tmp120__ |= ( pSrc->non_erp_present << 0 );
-        tmp120__ |= ( pSrc->use_prot << 1 );
-        tmp120__ |= ( pSrc->barker_preamble << 2 );
-        tmp120__ |= ( pSrc->unused << 3 );
-        *pBuf = tmp120__;
+        tmp126__ = 0U;
+        tmp126__ |= ( pSrc->non_erp_present << 0 );
+        tmp126__ |= ( pSrc->use_prot << 1 );
+        tmp126__ |= ( pSrc->barker_preamble << 2 );
+        tmp126__ |= ( pSrc->unused << 3 );
+        *pBuf = tmp126__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -28079,7 +28360,7 @@ tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp121__;
+    tANI_U8 tmp127__;
     nNeeded  += 2;
     while ( pSrc->present )
     {
@@ -28099,10 +28380,10 @@ tANI_U32 dot11fPackIeESERadMgmtCap(tpAniSirGlobal pCtx,
         *pBuf = pSrc->mgmt_state;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp121__ = 0U;
-        tmp121__ |= ( pSrc->mbssid_mask << 0 );
-        tmp121__ |= ( pSrc->reserved << 3 );
-        *pBuf = tmp121__;
+        tmp127__ = 0U;
+        tmp127__ |= ( pSrc->mbssid_mask << 0 );
+        tmp127__ |= ( pSrc->reserved << 3 );
+        *pBuf = tmp127__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -28289,10 +28570,16 @@ tANI_U32 dot11fPackIeExtCap(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U32 tmp122__;
-    tANI_U16 tmp123__;
-    tANI_U16 tmp124__;
-    nNeeded  += 8;
+    tANI_U8 tmp128__;
+    tANI_U8 tmp129__;
+    tANI_U8 tmp130__;
+    tANI_U8 tmp131__;
+    tANI_U8 tmp132__;
+    tANI_U8 tmp133__;
+    tANI_U8 tmp134__;
+    tANI_U8 tmp135__;
+    tANI_U8 tmp136__;
+    nNeeded  += 9;
     while ( pSrc->present )
     {
         if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW;
@@ -28300,72 +28587,121 @@ tANI_U32 dot11fPackIeExtCap(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp122__ = 0U;
-        tmp122__ |= ( pSrc->bssCoexistMgmtSupport << 0 );
-        tmp122__ |= ( pSrc->reserved1 << 1 );
-        tmp122__ |= ( pSrc->extChanSwitch << 2 );
-        tmp122__ |= ( pSrc->reserved2 << 3 );
-        tmp122__ |= ( pSrc->psmpCap << 4 );
-        tmp122__ |= ( pSrc->reserved3 << 5 );
-        tmp122__ |= ( pSrc->spsmpCap << 6 );
-        tmp122__ |= ( pSrc->event << 7 );
-        tmp122__ |= ( pSrc->diagnostics << 8 );
-        tmp122__ |= ( pSrc->multiDiagnostics << 9 );
-        tmp122__ |= ( pSrc->locTracking << 10 );
-        tmp122__ |= ( pSrc->FMS << 11 );
-        tmp122__ |= ( pSrc->proxyARPService << 12 );
-        tmp122__ |= ( pSrc->coLocIntfReporting << 13 );
-        tmp122__ |= ( pSrc->civicLoc << 14 );
-        tmp122__ |= ( pSrc->geospatialLoc << 15 );
-        tmp122__ |= ( pSrc->TFS << 16 );
-        tmp122__ |= ( pSrc->wnmSleepMode << 17 );
-        tmp122__ |= ( pSrc->timBroadcast << 18 );
-        tmp122__ |= ( pSrc->bssTransition << 19 );
-        tmp122__ |= ( pSrc->qosTrafficCap << 20 );
-        tmp122__ |= ( pSrc->acStaCnt << 21 );
-        tmp122__ |= ( pSrc->multiBSSID << 22 );
-        tmp122__ |= ( pSrc->timingMeas << 23 );
-        tmp122__ |= ( pSrc->chanUsage << 24 );
-        tmp122__ |= ( pSrc->ssidList << 25 );
-        tmp122__ |= ( pSrc->DMS << 26 );
-        tmp122__ |= ( pSrc->UTCTSFOffset << 27 );
-        tmp122__ |= ( pSrc->TDLSPeerUAPSDBufferSTA << 28 );
-        tmp122__ |= ( pSrc->TDLSPeerPSMSupp << 29 );
-        tmp122__ |= ( pSrc->TDLSChannelSwitching << 30 );
-        tmp122__ |= ( pSrc->interworkingService << 31 );
-        frameshtonl(pCtx, pBuf, tmp122__, 0);
-        *pnConsumed += 4;
-        pBuf += 4;
-        nBuf -=  4 ;
-        tmp123__ = 0U;
-        tmp123__ |= ( pSrc->qosMap << 0 );
-        tmp123__ |= ( pSrc->EBR << 1 );
-        tmp123__ |= ( pSrc->sspnInterface << 2 );
-        tmp123__ |= ( pSrc->reserved4 << 3 );
-        tmp123__ |= ( pSrc->msgCFCap << 4 );
-        tmp123__ |= ( pSrc->TDLSSupport << 5 );
-        tmp123__ |= ( pSrc->TDLSProhibited << 6 );
-        tmp123__ |= ( pSrc->TDLSChanSwitProhibited << 7 );
-        tmp123__ |= ( pSrc->rejectUnadmittedTraffic << 8 );
-        tmp123__ |= ( pSrc->serviceIntervalGranularity << 9 );
-        tmp123__ |= ( pSrc->identifierLoc << 12 );
-        tmp123__ |= ( pSrc->uapsdCoexistence << 13 );
-        tmp123__ |= ( pSrc->wnmNotification << 14 );
-        tmp123__ |= ( pSrc->reserved5 << 15 );
-        frameshtons(pCtx, pBuf, tmp123__, 0);
-        *pnConsumed += 2;
-        pBuf += 2;
-        nBuf -=  2 ;
-        tmp124__ = 0U;
-        tmp124__ |= ( pSrc->UTF8SSID << 0 );
-        tmp124__ |= ( pSrc->reserved6 << 1 );
-        tmp124__ |= ( pSrc->TDLSWiderBW << 13 );
-        tmp124__ |= ( pSrc->operModeNotification << 14 );
-        tmp124__ |= ( pSrc->reserved7 << 15 );
-        frameshtons(pCtx, pBuf, tmp124__, 0);
-        *pnConsumed += 2;
+        tmp128__ = 0U;
+        tmp128__ |= ( pSrc->bssCoexistMgmtSupport << 0 );
+        tmp128__ |= ( pSrc->reserved1 << 1 );
+        tmp128__ |= ( pSrc->extChanSwitch << 2 );
+        tmp128__ |= ( pSrc->reserved2 << 3 );
+        tmp128__ |= ( pSrc->psmpCap << 4 );
+        tmp128__ |= ( pSrc->reserved3 << 5 );
+        tmp128__ |= ( pSrc->spsmpCap << 6 );
+        tmp128__ |= ( pSrc->event << 7 );
+        *pBuf = tmp128__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp129__ = 0U;
+        tmp129__ |= ( pSrc->diagnostics << 0 );
+        tmp129__ |= ( pSrc->multiDiagnostics << 1 );
+        tmp129__ |= ( pSrc->locTracking << 2 );
+        tmp129__ |= ( pSrc->FMS << 3 );
+        tmp129__ |= ( pSrc->proxyARPService << 4 );
+        tmp129__ |= ( pSrc->coLocIntfReporting << 5 );
+        tmp129__ |= ( pSrc->civicLoc << 6 );
+        tmp129__ |= ( pSrc->geospatialLoc << 7 );
+        *pBuf = tmp129__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp130__ = 0U;
+        tmp130__ |= ( pSrc->TFS << 0 );
+        tmp130__ |= ( pSrc->wnmSleepMode << 1 );
+        tmp130__ |= ( pSrc->timBroadcast << 2 );
+        tmp130__ |= ( pSrc->bssTransition << 3 );
+        tmp130__ |= ( pSrc->qosTrafficCap << 4 );
+        tmp130__ |= ( pSrc->acStaCnt << 5 );
+        tmp130__ |= ( pSrc->multiBSSID << 6 );
+        tmp130__ |= ( pSrc->timingMeas << 7 );
+        *pBuf = tmp130__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp131__ = 0U;
+        tmp131__ |= ( pSrc->chanUsage << 0 );
+        tmp131__ |= ( pSrc->ssidList << 1 );
+        tmp131__ |= ( pSrc->DMS << 2 );
+        tmp131__ |= ( pSrc->UTCTSFOffset << 3 );
+        tmp131__ |= ( pSrc->TDLSPeerUAPSDBufferSTA << 4 );
+        tmp131__ |= ( pSrc->TDLSPeerPSMSupp << 5 );
+        tmp131__ |= ( pSrc->TDLSChannelSwitching << 6 );
+        tmp131__ |= ( pSrc->interworkingService << 7 );
+        *pBuf = tmp131__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp132__ = 0U;
+        tmp132__ |= ( pSrc->qosMap << 0 );
+        tmp132__ |= ( pSrc->EBR << 1 );
+        tmp132__ |= ( pSrc->sspnInterface << 2 );
+        tmp132__ |= ( pSrc->reserved4 << 3 );
+        tmp132__ |= ( pSrc->msgCFCap << 4 );
+        tmp132__ |= ( pSrc->TDLSSupport << 5 );
+        tmp132__ |= ( pSrc->TDLSProhibited << 6 );
+        tmp132__ |= ( pSrc->TDLSChanSwitProhibited << 7 );
+        *pBuf = tmp132__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp133__ = 0U;
+        tmp133__ |= ( pSrc->rejectUnadmittedTraffic << 0 );
+        tmp133__ |= ( pSrc->serviceIntervalGranularity << 1 );
+        tmp133__ |= ( pSrc->identifierLoc << 4 );
+        tmp133__ |= ( pSrc->uapsdCoexistence << 5 );
+        tmp133__ |= ( pSrc->wnmNotification << 6 );
+        tmp133__ |= ( pSrc->QABcapbility << 7 );
+        *pBuf = tmp133__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp134__ = 0U;
+        tmp134__ |= ( pSrc->UTF8SSID << 0 );
+        tmp134__ |= ( pSrc->QMFActivated << 1 );
+        tmp134__ |= ( pSrc->QMFreconAct << 2 );
+        tmp134__ |= ( pSrc->RobustAVStreaming << 3 );
+        tmp134__ |= ( pSrc->AdvancedGCR << 4 );
+        tmp134__ |= ( pSrc->MeshGCR << 5 );
+        tmp134__ |= ( pSrc->SCS << 6 );
+        tmp134__ |= ( pSrc->QLoadReport << 7 );
+        *pBuf = tmp134__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp135__ = 0U;
+        tmp135__ |= ( pSrc->AlternateEDCA << 0 );
+        tmp135__ |= ( pSrc->UnprotTXOPneg << 1 );
+        tmp135__ |= ( pSrc->ProtTXOPneg << 2 );
+        tmp135__ |= ( pSrc->reserved6 << 3 );
+        tmp135__ |= ( pSrc->ProtQLoadReport << 4 );
+        tmp135__ |= ( pSrc->TDLSWiderBW << 5 );
+        tmp135__ |= ( pSrc->operModeNotification << 6 );
+        tmp135__ |= ( pSrc->maxNumOfMSDU_bit1 << 7 );
+        *pBuf = tmp135__;
+        *pnConsumed += 1;
+        pBuf += 1;
+        nBuf -=  1 ;
+        tmp136__ = 0U;
+        tmp136__ |= ( pSrc->maxNumOfMSDU_bit2 << 0 );
+        tmp136__ |= ( pSrc->ChanSchMgmt << 1 );
+        tmp136__ |= ( pSrc->GeoDBInbandEnSignal << 2 );
+        tmp136__ |= ( pSrc->NwChanControl << 3 );
+        tmp136__ |= ( pSrc->WhiteSpaceMap << 4 );
+        tmp136__ |= ( pSrc->ChanAvailQuery << 5 );
+        tmp136__ |= ( pSrc->fineTimingMeas << 6 );
+        tmp136__ |= ( pSrc->reserved7 << 7 );
+        *pBuf = tmp136__;
+        *pnConsumed += 1;
         // fieldsEndFlag  = 1
-        nBuf -=  2 ;
+        nBuf -=  1 ;
         break;
     }
     (void)pCtx;
@@ -28559,7 +28895,7 @@ tANI_U32 dot11fPackIeFTInfo(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp125__;
+    tANI_U16 tmp137__;
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
     status = dot11fGetPackedIEFTInfo(pCtx, pSrc, &nNeeded);
     if ( ! DOT11F_SUCCEEDED( status ) ) return status;
@@ -28570,10 +28906,10 @@ tANI_U32 dot11fPackIeFTInfo(tpAniSirGlobal pCtx,
         ++pBuf; --nBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; --nBuf; ++(*pnConsumed);
-        tmp125__ = 0U;
-        tmp125__ |= ( pSrc->reserved << 0 );
-        tmp125__ |= ( pSrc->IECount << 8 );
-        frameshtons(pCtx, pBuf, tmp125__, 0);
+        tmp137__ = 0U;
+        tmp137__ |= ( pSrc->reserved << 0 );
+        tmp137__ |= ( pSrc->IECount << 8 );
+        frameshtons(pCtx, pBuf, tmp137__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -28612,11 +28948,11 @@ tANI_U32 dot11fPackIeHTCaps(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp126__;
-    tANI_U8 tmp127__;
-    tANI_U16 tmp128__;
-    tANI_U32 tmp129__;
-    tANI_U8 tmp130__;
+    tANI_U16 tmp138__;
+    tANI_U8 tmp139__;
+    tANI_U16 tmp140__;
+    tANI_U32 tmp141__;
+    tANI_U8 tmp142__;
     nNeeded  +=  (pSrc->num_rsvd + 26);
     while ( pSrc->present )
     {
@@ -28625,77 +28961,77 @@ tANI_U32 dot11fPackIeHTCaps(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp126__ = 0U;
-        tmp126__ |= ( pSrc->advCodingCap << 0 );
-        tmp126__ |= ( pSrc->supportedChannelWidthSet << 1 );
-        tmp126__ |= ( pSrc->mimoPowerSave << 2 );
-        tmp126__ |= ( pSrc->greenField << 4 );
-        tmp126__ |= ( pSrc->shortGI20MHz << 5 );
-        tmp126__ |= ( pSrc->shortGI40MHz << 6 );
-        tmp126__ |= ( pSrc->txSTBC << 7 );
-        tmp126__ |= ( pSrc->rxSTBC << 8 );
-        tmp126__ |= ( pSrc->delayedBA << 10 );
-        tmp126__ |= ( pSrc->maximalAMSDUsize << 11 );
-        tmp126__ |= ( pSrc->dsssCckMode40MHz << 12 );
-        tmp126__ |= ( pSrc->psmp << 13 );
-        tmp126__ |= ( pSrc->stbcControlFrame << 14 );
-        tmp126__ |= ( pSrc->lsigTXOPProtection << 15 );
-        frameshtons(pCtx, pBuf, tmp126__, 0);
+        tmp138__ = 0U;
+        tmp138__ |= ( pSrc->advCodingCap << 0 );
+        tmp138__ |= ( pSrc->supportedChannelWidthSet << 1 );
+        tmp138__ |= ( pSrc->mimoPowerSave << 2 );
+        tmp138__ |= ( pSrc->greenField << 4 );
+        tmp138__ |= ( pSrc->shortGI20MHz << 5 );
+        tmp138__ |= ( pSrc->shortGI40MHz << 6 );
+        tmp138__ |= ( pSrc->txSTBC << 7 );
+        tmp138__ |= ( pSrc->rxSTBC << 8 );
+        tmp138__ |= ( pSrc->delayedBA << 10 );
+        tmp138__ |= ( pSrc->maximalAMSDUsize << 11 );
+        tmp138__ |= ( pSrc->dsssCckMode40MHz << 12 );
+        tmp138__ |= ( pSrc->psmp << 13 );
+        tmp138__ |= ( pSrc->stbcControlFrame << 14 );
+        tmp138__ |= ( pSrc->lsigTXOPProtection << 15 );
+        frameshtons(pCtx, pBuf, tmp138__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
-        tmp127__ = 0U;
-        tmp127__ |= ( pSrc->maxRxAMPDUFactor << 0 );
-        tmp127__ |= ( pSrc->mpduDensity << 2 );
-        tmp127__ |= ( pSrc->reserved1 << 5 );
-        *pBuf = tmp127__;
+        tmp139__ = 0U;
+        tmp139__ |= ( pSrc->maxRxAMPDUFactor << 0 );
+        tmp139__ |= ( pSrc->mpduDensity << 2 );
+        tmp139__ |= ( pSrc->reserved1 << 5 );
+        *pBuf = tmp139__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16);
         *pnConsumed += 16;
         pBuf += 16;
-        tmp128__ = 0U;
-        tmp128__ |= ( pSrc->pco << 0 );
-        tmp128__ |= ( pSrc->transitionTime << 1 );
-        tmp128__ |= ( pSrc->reserved2 << 3 );
-        tmp128__ |= ( pSrc->mcsFeedback << 8 );
-        tmp128__ |= ( pSrc->reserved3 << 10 );
-        frameshtons(pCtx, pBuf, tmp128__, 0);
+        tmp140__ = 0U;
+        tmp140__ |= ( pSrc->pco << 0 );
+        tmp140__ |= ( pSrc->transitionTime << 1 );
+        tmp140__ |= ( pSrc->reserved2 << 3 );
+        tmp140__ |= ( pSrc->mcsFeedback << 8 );
+        tmp140__ |= ( pSrc->reserved3 << 10 );
+        frameshtons(pCtx, pBuf, tmp140__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
-        tmp129__ = 0U;
-        tmp129__ |= ( pSrc->txBF << 0 );
-        tmp129__ |= ( pSrc->rxStaggeredSounding << 1 );
-        tmp129__ |= ( pSrc->txStaggeredSounding << 2 );
-        tmp129__ |= ( pSrc->rxZLF << 3 );
-        tmp129__ |= ( pSrc->txZLF << 4 );
-        tmp129__ |= ( pSrc->implicitTxBF << 5 );
-        tmp129__ |= ( pSrc->calibration << 6 );
-        tmp129__ |= ( pSrc->explicitCSITxBF << 8 );
-        tmp129__ |= ( pSrc->explicitUncompressedSteeringMatrix << 9 );
-        tmp129__ |= ( pSrc->explicitBFCSIFeedback << 10 );
-        tmp129__ |= ( pSrc->explicitUncompressedSteeringMatrixFeedback << 13 );
-        tmp129__ |= ( pSrc->explicitCompressedSteeringMatrixFeedback << 16 );
-        tmp129__ |= ( pSrc->csiNumBFAntennae << 19 );
-        tmp129__ |= ( pSrc->uncompressedSteeringMatrixBFAntennae << 21 );
-        tmp129__ |= ( pSrc->compressedSteeringMatrixBFAntennae << 23 );
-        tmp129__ |= ( pSrc->reserved4 << 25 );
-        frameshtonl(pCtx, pBuf, tmp129__, 0);
+        tmp141__ = 0U;
+        tmp141__ |= ( pSrc->txBF << 0 );
+        tmp141__ |= ( pSrc->rxStaggeredSounding << 1 );
+        tmp141__ |= ( pSrc->txStaggeredSounding << 2 );
+        tmp141__ |= ( pSrc->rxZLF << 3 );
+        tmp141__ |= ( pSrc->txZLF << 4 );
+        tmp141__ |= ( pSrc->implicitTxBF << 5 );
+        tmp141__ |= ( pSrc->calibration << 6 );
+        tmp141__ |= ( pSrc->explicitCSITxBF << 8 );
+        tmp141__ |= ( pSrc->explicitUncompressedSteeringMatrix << 9 );
+        tmp141__ |= ( pSrc->explicitBFCSIFeedback << 10 );
+        tmp141__ |= ( pSrc->explicitUncompressedSteeringMatrixFeedback << 13 );
+        tmp141__ |= ( pSrc->explicitCompressedSteeringMatrixFeedback << 16 );
+        tmp141__ |= ( pSrc->csiNumBFAntennae << 19 );
+        tmp141__ |= ( pSrc->uncompressedSteeringMatrixBFAntennae << 21 );
+        tmp141__ |= ( pSrc->compressedSteeringMatrixBFAntennae << 23 );
+        tmp141__ |= ( pSrc->reserved4 << 25 );
+        frameshtonl(pCtx, pBuf, tmp141__, 0);
         *pnConsumed += 4;
         pBuf += 4;
         nBuf -=  4 ;
-        tmp130__ = 0U;
-        tmp130__ |= ( pSrc->antennaSelection << 0 );
-        tmp130__ |= ( pSrc->explicitCSIFeedbackTx << 1 );
-        tmp130__ |= ( pSrc->antennaIndicesFeedbackTx << 2 );
-        tmp130__ |= ( pSrc->explicitCSIFeedback << 3 );
-        tmp130__ |= ( pSrc->antennaIndicesFeedback << 4 );
-        tmp130__ |= ( pSrc->rxAS << 5 );
-        tmp130__ |= ( pSrc->txSoundingPPDUs << 6 );
-        tmp130__ |= ( pSrc->reserved5 << 7 );
-        *pBuf = tmp130__;
+        tmp142__ = 0U;
+        tmp142__ |= ( pSrc->antennaSelection << 0 );
+        tmp142__ |= ( pSrc->explicitCSIFeedbackTx << 1 );
+        tmp142__ |= ( pSrc->antennaIndicesFeedbackTx << 2 );
+        tmp142__ |= ( pSrc->explicitCSIFeedback << 3 );
+        tmp142__ |= ( pSrc->antennaIndicesFeedback << 4 );
+        tmp142__ |= ( pSrc->rxAS << 5 );
+        tmp142__ |= ( pSrc->txSoundingPPDUs << 6 );
+        tmp142__ |= ( pSrc->reserved5 << 7 );
+        *pBuf = tmp142__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -28721,9 +29057,9 @@ tANI_U32 dot11fPackIeHTInfo(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp131__;
-    tANI_U16 tmp132__;
-    tANI_U16 tmp133__;
+    tANI_U8 tmp143__;
+    tANI_U16 tmp144__;
+    tANI_U16 tmp145__;
     nNeeded  +=  (pSrc->num_rsvd + 22);
     while ( pSrc->present )
     {
@@ -28735,35 +29071,35 @@ tANI_U32 dot11fPackIeHTInfo(tpAniSirGlobal pCtx,
         *pBuf = pSrc->primaryChannel;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp131__ = 0U;
-        tmp131__ |= ( pSrc->secondaryChannelOffset << 0 );
-        tmp131__ |= ( pSrc->recommendedTxWidthSet << 2 );
-        tmp131__ |= ( pSrc->rifsMode << 3 );
-        tmp131__ |= ( pSrc->controlledAccessOnly << 4 );
-        tmp131__ |= ( pSrc->serviceIntervalGranularity << 5 );
-        *pBuf = tmp131__;
+        tmp143__ = 0U;
+        tmp143__ |= ( pSrc->secondaryChannelOffset << 0 );
+        tmp143__ |= ( pSrc->recommendedTxWidthSet << 2 );
+        tmp143__ |= ( pSrc->rifsMode << 3 );
+        tmp143__ |= ( pSrc->controlledAccessOnly << 4 );
+        tmp143__ |= ( pSrc->serviceIntervalGranularity << 5 );
+        *pBuf = tmp143__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp132__ = 0U;
-        tmp132__ |= ( pSrc->opMode << 0 );
-        tmp132__ |= ( pSrc->nonGFDevicesPresent << 2 );
-        tmp132__ |= ( pSrc->transmitBurstLimit << 3 );
-        tmp132__ |= ( pSrc->obssNonHTStaPresent << 4 );
-        tmp132__ |= ( pSrc->reserved << 5 );
-        frameshtons(pCtx, pBuf, tmp132__, 0);
+        tmp144__ = 0U;
+        tmp144__ |= ( pSrc->opMode << 0 );
+        tmp144__ |= ( pSrc->nonGFDevicesPresent << 2 );
+        tmp144__ |= ( pSrc->transmitBurstLimit << 3 );
+        tmp144__ |= ( pSrc->obssNonHTStaPresent << 4 );
+        tmp144__ |= ( pSrc->reserved << 5 );
+        frameshtons(pCtx, pBuf, tmp144__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
-        tmp133__ = 0U;
-        tmp133__ |= ( pSrc->basicSTBCMCS << 0 );
-        tmp133__ |= ( pSrc->dualCTSProtection << 7 );
-        tmp133__ |= ( pSrc->secondaryBeacon << 8 );
-        tmp133__ |= ( pSrc->lsigTXOPProtectionFullSupport << 9 );
-        tmp133__ |= ( pSrc->pcoActive << 10 );
-        tmp133__ |= ( pSrc->pcoPhase << 11 );
-        tmp133__ |= ( pSrc->reserved2 << 12 );
-        frameshtons(pCtx, pBuf, tmp133__, 0);
+        tmp145__ = 0U;
+        tmp145__ |= ( pSrc->basicSTBCMCS << 0 );
+        tmp145__ |= ( pSrc->dualCTSProtection << 7 );
+        tmp145__ |= ( pSrc->secondaryBeacon << 8 );
+        tmp145__ |= ( pSrc->lsigTXOPProtectionFullSupport << 9 );
+        tmp145__ |= ( pSrc->pcoActive << 10 );
+        tmp145__ |= ( pSrc->pcoPhase << 11 );
+        tmp145__ |= ( pSrc->reserved2 << 12 );
+        frameshtons(pCtx, pBuf, tmp145__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -28858,9 +29194,9 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp134__;
-    tANI_U8 tmp135__;
-    tANI_U8 tmp136__;
+    tANI_U8 tmp146__;
+    tANI_U8 tmp147__;
+    tANI_U8 tmp148__;
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
     status = dot11fGetPackedIEMeasurementReport(pCtx, pSrc, &nNeeded);
     if ( ! DOT11F_SUCCEEDED( status ) ) return status;
@@ -28874,12 +29210,12 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx,
         *pBuf = pSrc->token;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp134__ = 0U;
-        tmp134__ |= ( pSrc->late << 0 );
-        tmp134__ |= ( pSrc->incapable << 1 );
-        tmp134__ |= ( pSrc->refused << 2 );
-        tmp134__ |= ( pSrc->unused << 3 );
-        *pBuf = tmp134__;
+        tmp146__ = 0U;
+        tmp146__ |= ( pSrc->late << 0 );
+        tmp146__ |= ( pSrc->incapable << 1 );
+        tmp146__ |= ( pSrc->refused << 2 );
+        tmp146__ |= ( pSrc->unused << 3 );
+        *pBuf = tmp146__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -28899,14 +29235,14 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx,
                     frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0);
                     *pnConsumed += 2;
                     pBuf += 2;
-                    tmp135__ = 0U;
-                    tmp135__ |= ( pSrc->report.Basic.bss << 0 );
-                    tmp135__ |= ( pSrc->report.Basic.ofdm_preamble << 1 );
-                    tmp135__ |= ( pSrc->report.Basic.unid_signal << 2 );
-                    tmp135__ |= ( pSrc->report.Basic.rader << 3 );
-                    tmp135__ |= ( pSrc->report.Basic.unmeasured << 4 );
-                    tmp135__ |= ( pSrc->report.Basic.unused << 5 );
-                    *pBuf = tmp135__;
+                    tmp147__ = 0U;
+                    tmp147__ |= ( pSrc->report.Basic.bss << 0 );
+                    tmp147__ |= ( pSrc->report.Basic.ofdm_preamble << 1 );
+                    tmp147__ |= ( pSrc->report.Basic.unid_signal << 2 );
+                    tmp147__ |= ( pSrc->report.Basic.rader << 3 );
+                    tmp147__ |= ( pSrc->report.Basic.unmeasured << 4 );
+                    tmp147__ |= ( pSrc->report.Basic.unused << 5 );
+                    *pBuf = tmp147__;
                     *pnConsumed += 1;
                     // fieldsEndFlag  = 1
                     nBuf -=  1 ;
@@ -28973,10 +29309,10 @@ tANI_U32 dot11fPackIeMeasurementReport(tpAniSirGlobal pCtx,
                     frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0);
                     *pnConsumed += 2;
                     pBuf += 2;
-                    tmp136__ = 0U;
-                    tmp136__ |= ( pSrc->report.Beacon.condensed_PHY << 0 );
-                    tmp136__ |= ( pSrc->report.Beacon.reported_frame_type << 7 );
-                    *pBuf = tmp136__;
+                    tmp148__ = 0U;
+                    tmp148__ |= ( pSrc->report.Beacon.condensed_PHY << 0 );
+                    tmp148__ |= ( pSrc->report.Beacon.reported_frame_type << 7 );
+                    *pBuf = tmp148__;
                     *pnConsumed += 1;
                     pBuf += 1;
                     nBuf -=  1 ;
@@ -29025,7 +29361,7 @@ tANI_U32 dot11fPackIeMeasurementRequest(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp137__;
+    tANI_U8 tmp149__;
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
     status = dot11fGetPackedIEMeasurementRequest(pCtx, pSrc, &nNeeded);
     if ( ! DOT11F_SUCCEEDED( status ) ) return status;
@@ -29039,14 +29375,14 @@ tANI_U32 dot11fPackIeMeasurementRequest(tpAniSirGlobal pCtx,
         *pBuf = pSrc->measurement_token;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp137__ = 0U;
-        tmp137__ |= ( pSrc->parallel << 0 );
-        tmp137__ |= ( pSrc->enable << 1 );
-        tmp137__ |= ( pSrc->request << 2 );
-        tmp137__ |= ( pSrc->report << 3 );
-        tmp137__ |= ( pSrc->durationMandatory << 4 );
-        tmp137__ |= ( pSrc->unused << 5 );
-        *pBuf = tmp137__;
+        tmp149__ = 0U;
+        tmp149__ |= ( pSrc->parallel << 0 );
+        tmp149__ |= ( pSrc->enable << 1 );
+        tmp149__ |= ( pSrc->request << 2 );
+        tmp149__ |= ( pSrc->report << 3 );
+        tmp149__ |= ( pSrc->durationMandatory << 4 );
+        tmp149__ |= ( pSrc->unused << 5 );
+        *pBuf = tmp149__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -29135,7 +29471,7 @@ tANI_U32 dot11fPackIeMobilityDomain(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp138__;
+    tANI_U8 tmp150__;
     nNeeded  += 3;
     while ( pSrc->present )
     {
@@ -29147,11 +29483,11 @@ tANI_U32 dot11fPackIeMobilityDomain(tpAniSirGlobal pCtx,
         frameshtons(pCtx, pBuf, pSrc->MDID, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp138__ = 0U;
-        tmp138__ |= ( pSrc->overDSCap << 0 );
-        tmp138__ |= ( pSrc->resourceReqCap << 1 );
-        tmp138__ |= ( pSrc->reserved << 2 );
-        *pBuf = tmp138__;
+        tmp150__ = 0U;
+        tmp150__ |= ( pSrc->overDSCap << 0 );
+        tmp150__ |= ( pSrc->resourceReqCap << 1 );
+        tmp150__ |= ( pSrc->reserved << 2 );
+        *pBuf = tmp150__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -29174,8 +29510,8 @@ tANI_U32 dot11fPackIeNeighborReport(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp139__;
-    tANI_U8 tmp140__;
+    tANI_U8 tmp151__;
+    tANI_U8 tmp152__;
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
     status = dot11fGetPackedIENeighborReport(pCtx, pSrc, &nNeeded);
     if ( ! DOT11F_SUCCEEDED( status ) ) return status;
@@ -29189,24 +29525,24 @@ tANI_U32 dot11fPackIeNeighborReport(tpAniSirGlobal pCtx,
         DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6);
         *pnConsumed += 6;
         pBuf += 6;
-        tmp139__ = 0U;
-        tmp139__ |= ( pSrc->APReachability << 0 );
-        tmp139__ |= ( pSrc->Security << 2 );
-        tmp139__ |= ( pSrc->KeyScope << 3 );
-        tmp139__ |= ( pSrc->SpecMgmtCap << 4 );
-        tmp139__ |= ( pSrc->QosCap << 5 );
-        tmp139__ |= ( pSrc->apsd << 6 );
-        tmp139__ |= ( pSrc->rrm << 7 );
-        *pBuf = tmp139__;
+        tmp151__ = 0U;
+        tmp151__ |= ( pSrc->APReachability << 0 );
+        tmp151__ |= ( pSrc->Security << 2 );
+        tmp151__ |= ( pSrc->KeyScope << 3 );
+        tmp151__ |= ( pSrc->SpecMgmtCap << 4 );
+        tmp151__ |= ( pSrc->QosCap << 5 );
+        tmp151__ |= ( pSrc->apsd << 6 );
+        tmp151__ |= ( pSrc->rrm << 7 );
+        *pBuf = tmp151__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp140__ = 0U;
-        tmp140__ |= ( pSrc->DelayedBA << 0 );
-        tmp140__ |= ( pSrc->ImmBA << 1 );
-        tmp140__ |= ( pSrc->MobilityDomain << 2 );
-        tmp140__ |= ( pSrc->reserved << 3 );
-        *pBuf = tmp140__;
+        tmp152__ = 0U;
+        tmp152__ |= ( pSrc->DelayedBA << 0 );
+        tmp152__ |= ( pSrc->ImmBA << 1 );
+        tmp152__ |= ( pSrc->MobilityDomain << 2 );
+        tmp152__ |= ( pSrc->reserved << 3 );
+        *pBuf = tmp152__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -29296,7 +29632,7 @@ tANI_U32 dot11fPackIeOperatingMode(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp141__;
+    tANI_U8 tmp153__;
     nNeeded  += 1;
     while ( pSrc->present )
     {
@@ -29305,12 +29641,12 @@ tANI_U32 dot11fPackIeOperatingMode(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp141__ = 0U;
-        tmp141__ |= ( pSrc->chanWidth << 0 );
-        tmp141__ |= ( pSrc->reserved << 2 );
-        tmp141__ |= ( pSrc->rxNSS << 4 );
-        tmp141__ |= ( pSrc->rxNSSType << 7 );
-        *pBuf = tmp141__;
+        tmp153__ = 0U;
+        tmp153__ |= ( pSrc->chanWidth << 0 );
+        tmp153__ |= ( pSrc->reserved << 2 );
+        tmp153__ |= ( pSrc->rxNSS << 4 );
+        tmp153__ |= ( pSrc->rxNSSType << 7 );
+        *pBuf = tmp153__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -30264,7 +30600,7 @@ tANI_U32 dot11fPackIePUBufferStatus(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp142__;
+    tANI_U8 tmp154__;
     nNeeded  += 1;
     while ( pSrc->present )
     {
@@ -30273,13 +30609,13 @@ tANI_U32 dot11fPackIePUBufferStatus(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp142__ = 0U;
-        tmp142__ |= ( pSrc->ac_bk_traffic_aval << 0 );
-        tmp142__ |= ( pSrc->ac_be_traffic_aval << 1 );
-        tmp142__ |= ( pSrc->ac_vi_traffic_aval << 2 );
-        tmp142__ |= ( pSrc->ac_vo_traffic_aval << 3 );
-        tmp142__ |= ( pSrc->reserved << 4 );
-        *pBuf = tmp142__;
+        tmp154__ = 0U;
+        tmp154__ |= ( pSrc->ac_bk_traffic_aval << 0 );
+        tmp154__ |= ( pSrc->ac_be_traffic_aval << 1 );
+        tmp154__ |= ( pSrc->ac_vi_traffic_aval << 2 );
+        tmp154__ |= ( pSrc->ac_vo_traffic_aval << 3 );
+        tmp154__ |= ( pSrc->reserved << 4 );
+        *pBuf = tmp154__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -30401,7 +30737,7 @@ tANI_U32 dot11fPackIeQOSCapsAp(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp143__;
+    tANI_U8 tmp155__;
     nNeeded  += 1;
     while ( pSrc->present )
     {
@@ -30410,13 +30746,13 @@ tANI_U32 dot11fPackIeQOSCapsAp(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp143__ = 0U;
-        tmp143__ |= ( pSrc->count << 0 );
-        tmp143__ |= ( pSrc->qack << 4 );
-        tmp143__ |= ( pSrc->qreq << 5 );
-        tmp143__ |= ( pSrc->txopreq << 6 );
-        tmp143__ |= ( pSrc->reserved << 7 );
-        *pBuf = tmp143__;
+        tmp155__ = 0U;
+        tmp155__ |= ( pSrc->count << 0 );
+        tmp155__ |= ( pSrc->qack << 4 );
+        tmp155__ |= ( pSrc->qreq << 5 );
+        tmp155__ |= ( pSrc->txopreq << 6 );
+        tmp155__ |= ( pSrc->reserved << 7 );
+        *pBuf = tmp155__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -30439,7 +30775,7 @@ tANI_U32 dot11fPackIeQOSCapsStation(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp144__;
+    tANI_U8 tmp156__;
     nNeeded  += 1;
     while ( pSrc->present )
     {
@@ -30448,15 +30784,15 @@ tANI_U32 dot11fPackIeQOSCapsStation(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp144__ = 0U;
-        tmp144__ |= ( pSrc->acvo_uapsd << 0 );
-        tmp144__ |= ( pSrc->acvi_uapsd << 1 );
-        tmp144__ |= ( pSrc->acbk_uapsd << 2 );
-        tmp144__ |= ( pSrc->acbe_uapsd << 3 );
-        tmp144__ |= ( pSrc->qack << 4 );
-        tmp144__ |= ( pSrc->max_sp_length << 5 );
-        tmp144__ |= ( pSrc->more_data_ack << 7 );
-        *pBuf = tmp144__;
+        tmp156__ = 0U;
+        tmp156__ |= ( pSrc->acvo_uapsd << 0 );
+        tmp156__ |= ( pSrc->acvi_uapsd << 1 );
+        tmp156__ |= ( pSrc->acbk_uapsd << 2 );
+        tmp156__ |= ( pSrc->acbe_uapsd << 3 );
+        tmp156__ |= ( pSrc->qack << 4 );
+        tmp156__ |= ( pSrc->max_sp_length << 5 );
+        tmp156__ |= ( pSrc->more_data_ack << 7 );
+        *pBuf = tmp156__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -30960,9 +31296,9 @@ tANI_U32 dot11fPackIeVHTCaps(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U32 tmp145__;
-    tANI_U16 tmp146__;
-    tANI_U16 tmp147__;
+    tANI_U32 tmp157__;
+    tANI_U16 tmp158__;
+    tANI_U16 tmp159__;
     nNeeded  += 12;
     while ( pSrc->present )
     {
@@ -30971,48 +31307,48 @@ tANI_U32 dot11fPackIeVHTCaps(tpAniSirGlobal pCtx,
         ++pBuf; ++(*pnConsumed);
         pIeLen = pBuf;
         ++pBuf; ++(*pnConsumed);
-        tmp145__ = 0U;
-        tmp145__ |= ( pSrc->maxMPDULen << 0 );
-        tmp145__ |= ( pSrc->supportedChannelWidthSet << 2 );
-        tmp145__ |= ( pSrc->ldpcCodingCap << 4 );
-        tmp145__ |= ( pSrc->shortGI80MHz << 5 );
-        tmp145__ |= ( pSrc->shortGI160and80plus80MHz << 6 );
-        tmp145__ |= ( pSrc->txSTBC << 7 );
-        tmp145__ |= ( pSrc->rxSTBC << 8 );
-        tmp145__ |= ( pSrc->suBeamFormerCap << 11 );
-        tmp145__ |= ( pSrc->suBeamformeeCap << 12 );
-        tmp145__ |= ( pSrc->csnofBeamformerAntSup << 13 );
-        tmp145__ |= ( pSrc->numSoundingDim << 16 );
-        tmp145__ |= ( pSrc->muBeamformerCap << 19 );
-        tmp145__ |= ( pSrc->muBeamformeeCap << 20 );
-        tmp145__ |= ( pSrc->vhtTXOPPS << 21 );
-        tmp145__ |= ( pSrc->htcVHTCap << 22 );
-        tmp145__ |= ( pSrc->maxAMPDULenExp << 23 );
-        tmp145__ |= ( pSrc->vhtLinkAdaptCap << 26 );
-        tmp145__ |= ( pSrc->rxAntPattern << 28 );
-        tmp145__ |= ( pSrc->txAntPattern << 29 );
-        tmp145__ |= ( pSrc->reserved1 << 30 );
-        frameshtonl(pCtx, pBuf, tmp145__, 0);
+        tmp157__ = 0U;
+        tmp157__ |= ( pSrc->maxMPDULen << 0 );
+        tmp157__ |= ( pSrc->supportedChannelWidthSet << 2 );
+        tmp157__ |= ( pSrc->ldpcCodingCap << 4 );
+        tmp157__ |= ( pSrc->shortGI80MHz << 5 );
+        tmp157__ |= ( pSrc->shortGI160and80plus80MHz << 6 );
+        tmp157__ |= ( pSrc->txSTBC << 7 );
+        tmp157__ |= ( pSrc->rxSTBC << 8 );
+        tmp157__ |= ( pSrc->suBeamFormerCap << 11 );
+        tmp157__ |= ( pSrc->suBeamformeeCap << 12 );
+        tmp157__ |= ( pSrc->csnofBeamformerAntSup << 13 );
+        tmp157__ |= ( pSrc->numSoundingDim << 16 );
+        tmp157__ |= ( pSrc->muBeamformerCap << 19 );
+        tmp157__ |= ( pSrc->muBeamformeeCap << 20 );
+        tmp157__ |= ( pSrc->vhtTXOPPS << 21 );
+        tmp157__ |= ( pSrc->htcVHTCap << 22 );
+        tmp157__ |= ( pSrc->maxAMPDULenExp << 23 );
+        tmp157__ |= ( pSrc->vhtLinkAdaptCap << 26 );
+        tmp157__ |= ( pSrc->rxAntPattern << 28 );
+        tmp157__ |= ( pSrc->txAntPattern << 29 );
+        tmp157__ |= ( pSrc->reserved1 << 30 );
+        frameshtonl(pCtx, pBuf, tmp157__, 0);
         *pnConsumed += 4;
         pBuf += 4;
         nBuf -=  4 ;
         frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp146__ = 0U;
-        tmp146__ |= ( pSrc->rxHighSupDataRate << 0 );
-        tmp146__ |= ( pSrc->reserved2 << 13 );
-        frameshtons(pCtx, pBuf, tmp146__, 0);
+        tmp158__ = 0U;
+        tmp158__ |= ( pSrc->rxHighSupDataRate << 0 );
+        tmp158__ |= ( pSrc->reserved2 << 13 );
+        frameshtons(pCtx, pBuf, tmp158__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
         frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp147__ = 0U;
-        tmp147__ |= ( pSrc->txSupDataRate << 0 );
-        tmp147__ |= ( pSrc->reserved3 << 13 );
-        frameshtons(pCtx, pBuf, tmp147__, 0);
+        tmp159__ = 0U;
+        tmp159__ |= ( pSrc->txSupDataRate << 0 );
+        tmp159__ |= ( pSrc->reserved3 << 13 );
+        frameshtons(pCtx, pBuf, tmp159__, 0);
         *pnConsumed += 2;
         // fieldsEndFlag  = 1
         nBuf -=  2 ;
@@ -31215,7 +31551,7 @@ tANI_U32 dot11fPackIeWAPI(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U16 tmp148__;
+    tANI_U16 tmp160__;
     tANI_U32 status = DOT11F_PARSE_SUCCESS;
     status = dot11fGetPackedIEWAPI(pCtx, pSrc, &nNeeded);
     if ( ! DOT11F_SUCCEEDED( status ) ) return status;
@@ -31244,10 +31580,10 @@ tANI_U32 dot11fPackIeWAPI(tpAniSirGlobal pCtx,
         DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4);
         *pnConsumed += 4;
         pBuf += 4;
-        tmp148__ = 0U;
-        tmp148__ |= ( pSrc->preauth << 0 );
-        tmp148__ |= ( pSrc->reserved << 1 );
-        frameshtons(pCtx, pBuf, tmp148__, 0);
+        tmp160__ = 0U;
+        tmp160__ |= ( pSrc->preauth << 0 );
+        tmp160__ |= ( pSrc->reserved << 1 );
+        frameshtons(pCtx, pBuf, tmp160__, 0);
         *pnConsumed += 2;
         pBuf += 2;
         nBuf -=  2 ;
@@ -31390,7 +31726,7 @@ tANI_U32 dot11fPackIeWMMCaps(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp149__;
+    tANI_U8 tmp161__;
     nNeeded  += 2;
     while ( pSrc->present )
     {
@@ -31412,13 +31748,13 @@ tANI_U32 dot11fPackIeWMMCaps(tpAniSirGlobal pCtx,
         *pBuf = pSrc->version;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp149__ = 0U;
-        tmp149__ |= ( pSrc->reserved << 0 );
-        tmp149__ |= ( pSrc->qack << 4 );
-        tmp149__ |= ( pSrc->queue_request << 5 );
-        tmp149__ |= ( pSrc->txop_request << 6 );
-        tmp149__ |= ( pSrc->more_ack << 7 );
-        *pBuf = tmp149__;
+        tmp161__ = 0U;
+        tmp161__ |= ( pSrc->reserved << 0 );
+        tmp161__ |= ( pSrc->qack << 4 );
+        tmp161__ |= ( pSrc->queue_request << 5 );
+        tmp161__ |= ( pSrc->txop_request << 6 );
+        tmp161__ |= ( pSrc->more_ack << 7 );
+        *pBuf = tmp161__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -31441,7 +31777,7 @@ tANI_U32 dot11fPackIeWMMInfoAp(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp150__;
+    tANI_U8 tmp162__;
     nNeeded  += 2;
     while ( pSrc->present )
     {
@@ -31463,11 +31799,11 @@ tANI_U32 dot11fPackIeWMMInfoAp(tpAniSirGlobal pCtx,
         *pBuf = pSrc->version;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp150__ = 0U;
-        tmp150__ |= ( pSrc->param_set_count << 0 );
-        tmp150__ |= ( pSrc->reserved << 4 );
-        tmp150__ |= ( pSrc->uapsd << 7 );
-        *pBuf = tmp150__;
+        tmp162__ = 0U;
+        tmp162__ |= ( pSrc->param_set_count << 0 );
+        tmp162__ |= ( pSrc->reserved << 4 );
+        tmp162__ |= ( pSrc->uapsd << 7 );
+        *pBuf = tmp162__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -31490,7 +31826,7 @@ tANI_U32 dot11fPackIeWMMInfoStation(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp151__;
+    tANI_U8 tmp163__;
     nNeeded  += 2;
     while ( pSrc->present )
     {
@@ -31512,15 +31848,15 @@ tANI_U32 dot11fPackIeWMMInfoStation(tpAniSirGlobal pCtx,
         *pBuf = pSrc->version;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp151__ = 0U;
-        tmp151__ |= ( pSrc->acvo_uapsd << 0 );
-        tmp151__ |= ( pSrc->acvi_uapsd << 1 );
-        tmp151__ |= ( pSrc->acbk_uapsd << 2 );
-        tmp151__ |= ( pSrc->acbe_uapsd << 3 );
-        tmp151__ |= ( pSrc->reserved1 << 4 );
-        tmp151__ |= ( pSrc->max_sp_length << 5 );
-        tmp151__ |= ( pSrc->reserved2 << 7 );
-        *pBuf = tmp151__;
+        tmp163__ = 0U;
+        tmp163__ |= ( pSrc->acvo_uapsd << 0 );
+        tmp163__ |= ( pSrc->acvi_uapsd << 1 );
+        tmp163__ |= ( pSrc->acbk_uapsd << 2 );
+        tmp163__ |= ( pSrc->acbe_uapsd << 3 );
+        tmp163__ |= ( pSrc->reserved1 << 4 );
+        tmp163__ |= ( pSrc->max_sp_length << 5 );
+        tmp163__ |= ( pSrc->reserved2 << 7 );
+        *pBuf = tmp163__;
         *pnConsumed += 1;
         // fieldsEndFlag  = 1
         nBuf -=  1 ;
@@ -31543,14 +31879,14 @@ tANI_U32 dot11fPackIeWMMParams(tpAniSirGlobal pCtx,
     tANI_U8* pIeLen = 0;
     tANI_U32 nConsumedOnEntry = *pnConsumed;
     tANI_U32 nNeeded = 0U;
-    tANI_U8 tmp152__;
-    tANI_U8 tmp153__;
-    tANI_U8 tmp154__;
-    tANI_U8 tmp155__;
-    tANI_U8 tmp156__;
-    tANI_U8 tmp157__;
-    tANI_U8 tmp158__;
-    tANI_U8 tmp159__;
+    tANI_U8 tmp164__;
+    tANI_U8 tmp165__;
+    tANI_U8 tmp166__;
+    tANI_U8 tmp167__;
+    tANI_U8 tmp168__;
+    tANI_U8 tmp169__;
+    tANI_U8 tmp170__;
+    tANI_U8 tmp171__;
     nNeeded  += 19;
     while ( pSrc->present )
     {
@@ -31578,76 +31914,76 @@ tANI_U32 dot11fPackIeWMMParams(tpAniSirGlobal pCtx,
         *pBuf = pSrc->reserved2;
         *pnConsumed += 1;
         pBuf += 1;
-        tmp152__ = 0U;
-        tmp152__ |= ( pSrc->acbe_aifsn << 0 );
-        tmp152__ |= ( pSrc->acbe_acm << 4 );
-        tmp152__ |= ( pSrc->acbe_aci << 5 );
-        tmp152__ |= ( pSrc->unused1 << 7 );
-        *pBuf = tmp152__;
+        tmp164__ = 0U;
+        tmp164__ |= ( pSrc->acbe_aifsn << 0 );
+        tmp164__ |= ( pSrc->acbe_acm << 4 );
+        tmp164__ |= ( pSrc->acbe_aci << 5 );
+        tmp164__ |= ( pSrc->unused1 << 7 );
+        *pBuf = tmp164__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp153__ = 0U;
-        tmp153__ |= ( pSrc->acbe_acwmin << 0 );
-        tmp153__ |= ( pSrc->acbe_acwmax << 4 );
-        *pBuf = tmp153__;
+        tmp165__ = 0U;
+        tmp165__ |= ( pSrc->acbe_acwmin << 0 );
+        tmp165__ |= ( pSrc->acbe_acwmax << 4 );
+        *pBuf = tmp165__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp154__ = 0U;
-        tmp154__ |= ( pSrc->acbk_aifsn << 0 );
-        tmp154__ |= ( pSrc->acbk_acm << 4 );
-        tmp154__ |= ( pSrc->acbk_aci << 5 );
-        tmp154__ |= ( pSrc->unused2 << 7 );
-        *pBuf = tmp154__;
+        tmp166__ = 0U;
+        tmp166__ |= ( pSrc->acbk_aifsn << 0 );
+        tmp166__ |= ( pSrc->acbk_acm << 4 );
+        tmp166__ |= ( pSrc->acbk_aci << 5 );
+        tmp166__ |= ( pSrc->unused2 << 7 );
+        *pBuf = tmp166__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp155__ = 0U;
-        tmp155__ |= ( pSrc->acbk_acwmin << 0 );
-        tmp155__ |= ( pSrc->acbk_acwmax << 4 );
-        *pBuf = tmp155__;
+        tmp167__ = 0U;
+        tmp167__ |= ( pSrc->acbk_acwmin << 0 );
+        tmp167__ |= ( pSrc->acbk_acwmax << 4 );
+        *pBuf = tmp167__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp156__ = 0U;
-        tmp156__ |= ( pSrc->acvi_aifsn << 0 );
-        tmp156__ |= ( pSrc->acvi_acm << 4 );
-        tmp156__ |= ( pSrc->acvi_aci << 5 );
-        tmp156__ |= ( pSrc->unused3 << 7 );
-        *pBuf = tmp156__;
+        tmp168__ = 0U;
+        tmp168__ |= ( pSrc->acvi_aifsn << 0 );
+        tmp168__ |= ( pSrc->acvi_acm << 4 );
+        tmp168__ |= ( pSrc->acvi_aci << 5 );
+        tmp168__ |= ( pSrc->unused3 << 7 );
+        *pBuf = tmp168__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp157__ = 0U;
-        tmp157__ |= ( pSrc->acvi_acwmin << 0 );
-        tmp157__ |= ( pSrc->acvi_acwmax << 4 );
-        *pBuf = tmp157__;
+        tmp169__ = 0U;
+        tmp169__ |= ( pSrc->acvi_acwmin << 0 );
+        tmp169__ |= ( pSrc->acvi_acwmax << 4 );
+        *pBuf = tmp169__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
         frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0);
         *pnConsumed += 2;
         pBuf += 2;
-        tmp158__ = 0U;
-        tmp158__ |= ( pSrc->acvo_aifsn << 0 );
-        tmp158__ |= ( pSrc->acvo_acm << 4 );
-        tmp158__ |= ( pSrc->acvo_aci << 5 );
-        tmp158__ |= ( pSrc->unused4 << 7 );
-        *pBuf = tmp158__;
+        tmp170__ = 0U;
+        tmp170__ |= ( pSrc->acvo_aifsn << 0 );
+        tmp170__ |= ( pSrc->acvo_acm << 4 );
+        tmp170__ |= ( pSrc->acvo_aci << 5 );
+        tmp170__ |= ( pSrc->unused4 << 7 );
+        *pBuf = tmp170__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
-        tmp159__ = 0U;
-        tmp159__ |= ( pSrc->acvo_acwmin << 0 );
-        tmp159__ |= ( pSrc->acvo_acwmax << 4 );
-        *pBuf = tmp159__;
+        tmp171__ = 0U;
+        tmp171__ |= ( pSrc->acvo_acwmin << 0 );
+        tmp171__ |= ( pSrc->acvo_acwmax << 4 );
+        *pBuf = tmp171__;
         *pnConsumed += 1;
         pBuf += 1;
         nBuf -=  1 ;
@@ -33346,11 +33682,30 @@ tANI_U32 dot11fPackAssocRequest(tpAniSirGlobal pCtx, tDot11fAssocRequest *pFrm,
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("OperatingMode:\n"));
@@ -34501,11 +34856,30 @@ tANI_U32 dot11fPackAssocResponse(tpAniSirGlobal pCtx, tDot11fAssocResponse *pFrm
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -35986,11 +36360,30 @@ tANI_U32 dot11fPackBeacon(tpAniSirGlobal pCtx, tDot11fBeacon *pFrm, tANI_U8 *pBu
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OperatingMode:\n"));
@@ -37060,11 +37453,30 @@ tANI_U32 dot11fPackBeacon2(tpAniSirGlobal pCtx, tDot11fBeacon2 *pFrm, tANI_U8 *p
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("OperatingMode:\n"));
@@ -38300,11 +38712,30 @@ tANI_U32 dot11fPackBeaconIEs(tpAniSirGlobal pCtx, tDot11fBeaconIEs *pFrm, tANI_U
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OperatingMode:\n"));
@@ -41475,11 +41906,30 @@ tANI_U32 dot11fPackProbeResponse(tpAniSirGlobal pCtx, tDot11fProbeResponse *pFrm
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -42885,11 +43335,30 @@ tANI_U32 dot11fPackReAssocRequest(tpAniSirGlobal pCtx, tDot11fReAssocRequest *pF
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("OperatingMode:\n"));
@@ -44047,11 +44516,30 @@ tANI_U32 dot11fPackReAssocResponse(tpAniSirGlobal pCtx, tDot11fReAssocResponse *
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("OBSSScanParameters:\n"));
@@ -44349,11 +44837,30 @@ tANI_U32 dot11fPackTDLSDisRsp(tpAniSirGlobal pCtx, tDot11fTDLSDisRsp *pFrm, tANI
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSDISRSP), FRFL("FTInfo:\n"));
@@ -45020,11 +45527,30 @@ tANI_U32 dot11fPackTDLSSetupReq(tpAniSirGlobal pCtx, tDot11fTDLSSetupReq *pFrm,
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPREQ), FRFL("SuppOperatingClasses:\n"));
@@ -45414,11 +45940,30 @@ tANI_U32 dot11fPackTDLSSetupRsp(tpAniSirGlobal pCtx, tDot11fTDLSSetupRsp *pFrm,
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("identifierLoc (1): %d\n"), pFrm->ExtCap.identifierLoc);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("uapsdCoexistence (1): %d\n"), pFrm->ExtCap.uapsdCoexistence);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("wnmNotification (1): %d\n"), pFrm->ExtCap.wnmNotification);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved5 (1): %d\n"), pFrm->ExtCap.reserved5);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QABcapbility (1): %d\n"), pFrm->ExtCap.QABcapbility);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("UTF8SSID (1): %d\n"), pFrm->ExtCap.UTF8SSID);
-            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved6 (12): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QMFActivated (1): %d\n"), pFrm->ExtCap.QMFActivated);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QMFreconAct (1): %d\n"), pFrm->ExtCap.QMFreconAct);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("RobustAVStreaming (1): %d\n"), pFrm->ExtCap.RobustAVStreaming);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AdvancedGCR (1): %d\n"), pFrm->ExtCap.AdvancedGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("MeshGCR (1): %d\n"), pFrm->ExtCap.MeshGCR);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SCS (1): %d\n"), pFrm->ExtCap.SCS);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("QLoadReport (1): %d\n"), pFrm->ExtCap.QLoadReport);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("AlternateEDCA (1): %d\n"), pFrm->ExtCap.AlternateEDCA);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("UnprotTXOPneg (1): %d\n"), pFrm->ExtCap.UnprotTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ProtTXOPneg (1): %d\n"), pFrm->ExtCap.ProtTXOPneg);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved6 (1): %d\n"), pFrm->ExtCap.reserved6);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ProtQLoadReport (1): %d\n"), pFrm->ExtCap.ProtQLoadReport);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("TDLSWiderBW (1): %d\n"), pFrm->ExtCap.TDLSWiderBW);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("operModeNotification (1): %d\n"), pFrm->ExtCap.operModeNotification);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxNumOfMSDU_bit1 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit1);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("maxNumOfMSDU_bit2 (1): %d\n"), pFrm->ExtCap.maxNumOfMSDU_bit2);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ChanSchMgmt (1): %d\n"), pFrm->ExtCap.ChanSchMgmt);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("GeoDBInbandEnSignal (1): %d\n"), pFrm->ExtCap.GeoDBInbandEnSignal);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("NwChanControl (1): %d\n"), pFrm->ExtCap.NwChanControl);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("WhiteSpaceMap (1): %d\n"), pFrm->ExtCap.WhiteSpaceMap);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("ChanAvailQuery (1): %d\n"), pFrm->ExtCap.ChanAvailQuery);
+            FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("fineTimingMeas (1): %d\n"), pFrm->ExtCap.fineTimingMeas);
             FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
         }
         FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_TDLSSETUPRSP), FRFL("SuppOperatingClasses:\n"));
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index ed9fbbaaf2b2..c6eb89562043 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -1081,7 +1081,7 @@ PopulateDot11fExtCap(tpAniSirGlobal   pMac,
 
     if (val)   // If set to true then set RTTv3
     {
-       pDot11f->timingMeas = 1;
+       pDot11f->fineTimingMeas = 1;
     }
 
 #ifdef QCA_HT_2040_COEX
@@ -2457,8 +2457,9 @@ sirConvertAssocReqFrame2Struct(tpAniSirGlobal pMac,
     if (ar->ExtCap.present)
     {
         vos_mem_copy(&pAssocReq->ExtCap, &ar->ExtCap, sizeof(tDot11fIEExtCap));
-        limLog(pMac, LOG1, FL("ExtCap is present, timingMeas: %d"),
-               ar->ExtCap.timingMeas);
+        limLog(pMac, LOG1,
+               FL("ExtCap is present, timingMeas: %d, fineTimingMeas: %d"),
+               ar->ExtCap.timingMeas, ar->ExtCap.fineTimingMeas);
     }
     vos_mem_free(ar);
     return eSIR_SUCCESS;
@@ -2634,8 +2635,9 @@ sirConvertAssocRespFrame2Struct(tpAniSirGlobal pMac,
     if (ar.ExtCap.present)
     {
         vos_mem_copy(&pAssocRsp->ExtCap, &ar.ExtCap, sizeof(tDot11fIEExtCap));
-        limLog(pMac, LOG1, FL("ExtCap is present, timingMeas: %d"),
-               ar.ExtCap.timingMeas);
+        limLog(pMac, LOG1,
+               FL("ExtCap is present, timingMeas: %d, fineTimingMeas: %d"),
+               ar.ExtCap.timingMeas, ar.ExtCap.fineTimingMeas);
     }
 
     if ( ar.QosMapSet.present )
@@ -2829,8 +2831,9 @@ sirConvertReassocReqFrame2Struct(tpAniSirGlobal pMac,
     if (ar.ExtCap.present)
     {
         vos_mem_copy(&pAssocReq->ExtCap, &ar.ExtCap, sizeof(tDot11fIEExtCap));
-        limLog(pMac, LOG1, FL("ExtCap is present, timingMeas: %d"),
-               ar.ExtCap.timingMeas);
+        limLog(pMac, LOG1,
+               FL("ExtCap is present, timingMeas: %d, fineTimingMeas: %d"),
+               ar.ExtCap.timingMeas, ar.ExtCap.fineTimingMeas);
     }
 
     return eSIR_SUCCESS;
author	Krishna Kumaar Natarajan <kknatara@qca.qualcomm.com>	2014-08-04 12:58:42 -0700
committer	AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com>	2014-09-19 21:29:31 +0530
commit	e9e6bfe27e16131daf7ddc649499509bc6c7b4eb (patch)
tree	466823923c8b8f20009e1a34fb562e6958edc496
parent	e71c5961d0c9b5cc76f4439e06103d1c690c310b (diff)