HS2.0 REL2:Add support for qos-mapping.
New IE in Assoc req is sent by AP to indicate DSCP to UP mapping
at the time of association.Also dynamically AP can update this
info using QosMap Configure Action frame.This commit adds support
in the driver to receive and parse them so that data will go
as indicated by AP
Change-Id: I4614110e02cc57dce37ca149817ffe8bd03e1f99
CRs-fixed: 583910
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index a40ffc1..e206dfe 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -190,6 +190,8 @@
#define HDD_WAKE_LOCK_DURATION 50 //in msecs
#endif
+#define WLAN_HDD_QOS_ACTION_FRAME 1
+#define WLAN_HDD_QOS_MAP_CONFIGURE 4
#define HDD_SAP_WAKE_LOCK_DURATION 10000 //in msecs
#define HDD_MOD_EXIT_SSR_MAX_RETRIES 30
@@ -228,7 +230,6 @@
#define MIN(a, b) (a > b ? b : a)
#endif
-
/*
* Generic asynchronous request/response support
*
@@ -260,6 +261,7 @@
* API timeout coincides with its callback, the operations of the two
* threads will be serialized.
*/
+
struct statsContext
{
struct completion completion;
diff --git a/CORE/HDD/inc/wlan_hdd_wmm.h b/CORE/HDD/inc/wlan_hdd_wmm.h
index f14203c..83c0994 100644
--- a/CORE/HDD/inc/wlan_hdd_wmm.h
+++ b/CORE/HDD/inc/wlan_hdd_wmm.h
@@ -203,6 +203,10 @@
extern const v_U8_t hddWmmUpToAcMap[];
extern const v_U8_t hddLinuxUpToAcMap[];
+#define WLAN_HDD_MAX_DSCP 0x3f
+extern sme_QosWmmUpType hddWmmDscpToUpMapInfra[WLAN_HDD_MAX_DSCP+1];
+extern sme_QosWmmUpType hddWmmDscpToUpMapP2p[WLAN_HDD_MAX_DSCP+1];
+
/**============================================================================
@brief hdd_wmm_init() - Function which will initialize the WMM configuation
and status to an initial state. The configuration can later be overwritten
@@ -214,7 +218,7 @@
: other values if failure
===========================================================================*/
-VOS_STATUS hdd_wmm_init ( hdd_context_t* pHddCtx );
+VOS_STATUS hdd_wmm_init ( hdd_context_t* pHddCtx, sme_QosWmmUpType* hddWmmDscpToUpMap );
/**============================================================================
@brief hdd_wmm_adapter_init() - Function which will initialize the WMM configuation
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 76aeece..ab12012 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -797,6 +797,10 @@
pHddCtx->isAmpAllowed = VOS_TRUE;
}
hdd_clearRoamProfileIe( pAdapter );
+ if(pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
+ {
+ hdd_wmm_init( pHddCtx, hddWmmDscpToUpMapInfra );
+ }
// indicate 'disconnect' status to wpa_supplicant...
hdd_SendAssociationEvent(dev,pRoamInfo);
@@ -1561,6 +1565,10 @@
/*Clear the roam profile*/
hdd_clearRoamProfileIe( pAdapter );
+ if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)
+ {
+ hdd_wmm_init( pHddCtx, hddWmmDscpToUpMapInfra );
+ }
WLANTL_AssocFailed(pRoamInfo->staId);
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index af14c5e..8b8064e 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2161,7 +2161,8 @@
}
/* Initialize the WMM module */
- vosStatus = hdd_wmm_init(pHddCtx);
+ vosStatus = hdd_wmm_init(pHddCtx, hddWmmDscpToUpMapInfra);
+ vosStatus = hdd_wmm_init(pHddCtx, hddWmmDscpToUpMapP2p);
if ( !VOS_IS_STATUS_SUCCESS( vosStatus ))
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5707202..ad169b1 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8354,7 +8354,8 @@
}
//Initialize the WMM module
- status = hdd_wmm_init(pHddCtx);
+ status = hdd_wmm_init(pHddCtx, hddWmmDscpToUpMapInfra);
+ status = hdd_wmm_init(pHddCtx, hddWmmDscpToUpMapP2p);
if (!VOS_IS_STATUS_SUCCESS(status))
{
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: hdd_wmm_init failed", __func__);
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 30df11e..f4e8038 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -41,6 +41,7 @@
#include <wlan_hdd_hostapd.h>
#include <net/cfg80211.h>
#include "sme_Api.h"
+#include "sme_QosApi.h"
#include "wlan_hdd_p2p.h"
#include "sapApi.h"
#include "wlan_hdd_main.h"
@@ -1650,8 +1651,8 @@
tANI_U8 subType = 0;
tActionFrmType actionFrmType;
hdd_cfg80211_state_t *cfgState = NULL;
- hdd_context_t *pHddCtx = NULL;
hdd_scaninfo_t *pScanInfo = NULL;
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d",
__func__, frameType, nFrameLength);
@@ -1845,6 +1846,11 @@
}
}
#endif
+ if((pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET] == WLAN_HDD_QOS_ACTION_FRAME)&&
+ (pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET+1] == WLAN_HDD_QOS_MAP_CONFIGURE) )
+ {
+ sme_UpdateDSCPtoUPMapping(pHddCtx->hHal, hddWmmDscpToUpMapInfra);
+ }
}
//Indicate Frame Over Normal Interface
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 469f8f4..1a79579 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -93,8 +93,10 @@
#define DHCP_SOURCE_PORT 0x4400
#define DHCP_DESTINATION_PORT 0x4300
-static sme_QosWmmUpType hddWmmDscpToUpMap[WLAN_HDD_MAX_DSCP+1];
#define HDD_WMM_UP_TO_AC_MAP_SIZE 8
+sme_QosWmmUpType hddWmmDscpToUpMapInfra[WLAN_HDD_MAX_DSCP+1];
+sme_QosWmmUpType hddWmmDscpToUpMapP2p[WLAN_HDD_MAX_DSCP+1];
+
const v_U8_t hddWmmUpToAcMap[] = {
WLANTL_AC_BE,
WLANTL_AC_BK,
@@ -1501,7 +1503,7 @@
: other values if failure
===========================================================================*/
-VOS_STATUS hdd_wmm_init ( hdd_context_t* pHddCtx )
+VOS_STATUS hdd_wmm_init ( hdd_context_t* pHddCtx, sme_QosWmmUpType* hddWmmDscpToUpMap )
{
v_U8_t dscp;
@@ -1772,8 +1774,14 @@
}
dscp = (tos>>2) & 0x3f;
- userPri = hddWmmDscpToUpMap[dscp];
-
+ if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)
+ {
+ userPri = hddWmmDscpToUpMapInfra[dscp];
+ }
+ else
+ {
+ userPri = hddWmmDscpToUpMapP2p[dscp];
+ }
#ifdef HDD_WMM_DEBUG
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: tos is %d, dscp is %d, up is %d",
@@ -2115,6 +2123,7 @@
{
tANI_U8 uapsdMask;
VOS_STATUS status;
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
// when we associate we need to notify TL if it needs to enable
// UAPSD for any access categories
@@ -2198,6 +2207,11 @@
VOS_ASSERT( VOS_IS_STATUS_SUCCESS( status ));
}
+ status = sme_UpdateDSCPtoUPMapping(pHddCtx->hHal, hddWmmDscpToUpMapInfra);
+ if (!VOS_IS_STATUS_SUCCESS( status ))
+ {
+ hdd_wmm_init( pHddCtx, hddWmmDscpToUpMapInfra );
+ }
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Exiting", __func__);
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 45c6e2e..a516a9d 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -1065,6 +1065,7 @@
tANI_U8 fScanOffload;
tANI_U8 isCoalesingInIBSSAllowed;
tANI_U32 fEnableDebugLog;
+ tSirQosMapSet QosMapSet;
} tAniSirGlobal;
#ifdef FEATURE_WLAN_TDLS
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index a8b677b..336d064 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -2731,6 +2731,13 @@
tSirMacNoise noise;
} tSirGetNoiseRsp, *tpSirGetNoiseRsp;
+typedef struct sSirQosMapSet
+{
+ tANI_U8 present;
+ tANI_U8 num_dscp_exceptions;
+ tANI_U8 dscp_exceptions[21][2];
+ tANI_U8 dscp_range[7][2];
+} tSirQosMapSet, *tpSirQosMapSet;
//
// PMC --> PE --> HAL
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 6f1cfb6..f5c5e96 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -184,6 +184,7 @@
#define SIR_MAC_QOS_ADD_TS_RSP 1
#define SIR_MAC_QOS_DEL_TS_REQ 2
#define SIR_MAC_QOS_SCHEDULE 3
+#define SIR_MAC_QOS_MAP_CONFIGURE 4
// and these are proprietary
#define SIR_MAC_QOS_DEF_BA_REQ 4
#define SIR_MAC_QOS_DEF_BA_RSP 5
diff --git a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
index 4d6e303..43caa5e 100644
--- a/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
+++ b/CORE/MAC/src/cfg/cfgUtil/dot11f.frms
@@ -106,6 +106,7 @@
const EID_LINK_IDENTIFIER = 101;
const EID_PTI_CONTROL = 105;
const EID_PU_BUFFER_STATUS = 106;
+const EID_QOS_MAP_SET = 110;
const EID_ESE_SPECIFIC = 150;
const EID_ESE_CCKM_SPECIFIC = 156;
const EID_VHT_CAPABILITIES = 191;
@@ -416,31 +417,6 @@
ouiSubtype, 1;
}
-FF RMCOUI (3)
-{
- oui[3];
-}
-
-FF MagicCode (6)
-{
- magic[6];
-}
-
-FF RMCVersion (1)
-{
- version, 1;
-}
-
-FF RMCDialogToken (4)
-{
- token, 4;
-}
-
-FF Leader (6)
-{
- mac[6];
-}
-
FF VhtMembershipStatusArray(8) // 8.4.1.51
{
membershipStatusArray[8];
@@ -2863,6 +2839,11 @@
}
}
+IE QosMapSet (EID_QOS_MAP_SET)
+{
+ dscp_exceptions[0..60];
+}
+
CONTAINERIE RICDataDesc
{
MANDIE RICData;
@@ -3535,6 +3516,7 @@
OPTIE VHTCaps;
OPTIE ExtCap;
OPTIE OperatingMode;
+ OPTIE QosMapSet;
} // End frame AssocRequest.
FRAME AssocResponse // 7.2.3.5
@@ -3567,7 +3549,8 @@
OPTIE VHTCaps;
OPTIE VHTOperation;
OPTIE ExtCap;
- OPTIE OBSSScanParameters;
+ OPTIE OBSSScanParameters;
+ OPTIE QosMapSet;
} // End frame AssocResponse.
FRAME ReAssocRequest // 7.2.3.6
@@ -3603,6 +3586,7 @@
OPTIE VHTCaps;
OPTIE ExtCap;
OPTIE OperatingMode;
+ OPTIE QosMapSet;
} // End frame ReAssocRequest.
FRAME ReAssocResponse // 7.2.3.7
@@ -3636,7 +3620,8 @@
OPTIE VHTCaps;
OPTIE VHTOperation;
OPTIE ExtCap;
- OPTIE OBSSScanParameters;
+ OPTIE OBSSScanParameters;
+ OPTIE QosMapSet;
} // End frame ReAssocResponse.
FRAME ProbeRequest // 7.2.3.8
@@ -4227,15 +4212,11 @@
FF TransactionId;
}
-FRAME RMC
+FRAME QosMapConfigure
{
FF Category;
- FF RMCOUI;
- FF MagicCode;
- FF RMCVersion;
FF Action;
- FF RMCDialogToken;
- FF Leader;
+ MANDIE QosMapSet;
}
FRAME VHTGidManagementActionFrame
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h
index 5054148..059cb64 100644
--- a/CORE/MAC/src/include/dot11f.h
+++ b/CORE/MAC/src/include/dot11f.h
@@ -19,15 +19,11 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*
- * Copyright (c) 2012 - 2014 Qualcomm Atheros, Inc.
- * All Rights Reserved.
- * Qualcomm Atheros Confidential and Proprietary.
- *
- */
-
-
-
+/**
+ * Copyright (c) 2012 - 2014 Qualcomm Atheros, Inc.
+ * All Rights Reserved.
+ * Qualcomm Atheros Confidential and Proprietary.
+ */
#ifndef DOT11F_H
#define DOT11F_H
@@ -41,7 +37,7 @@
*
*
* This file was automatically generated by 'framesc'
- * Wed Feb 26 16:47:36 2014 from the following file(s):
+ * Wed Apr 16 11:21:06 2014 from the following file(s):
*
* dot11f.frms
*
@@ -307,16 +303,6 @@
void dot11fPackFfDialogToken(tpAniSirGlobal, tDot11fFfDialogToken*, tANI_U8*);
-typedef struct sDot11fFfLeader {
- tANI_U8 mac[6];
-} tDot11fFfLeader;
-
-#define DOT11F_FF_LEADER_LEN ( 6 )
-
-void dot11fUnpackFfLeader(tpAniSirGlobal, tANI_U8*, tDot11fFfLeader*);
-
-void dot11fPackFfLeader(tpAniSirGlobal, tDot11fFfLeader*, tANI_U8*);
-
typedef struct sDot11fFfLinkMargin {
tANI_U8 linkMargin;
} tDot11fFfLinkMargin;
@@ -337,16 +323,6 @@
void dot11fPackFfListenInterval(tpAniSirGlobal, tDot11fFfListenInterval*, tANI_U8*);
-typedef struct sDot11fFfMagicCode {
- tANI_U8 magic[6];
-} tDot11fFfMagicCode;
-
-#define DOT11F_FF_MAGICCODE_LEN ( 6 )
-
-void dot11fUnpackFfMagicCode(tpAniSirGlobal, tANI_U8*, tDot11fFfMagicCode*);
-
-void dot11fPackFfMagicCode(tpAniSirGlobal, tDot11fFfMagicCode*, tANI_U8*);
-
typedef struct sDot11fFfMaxTxPower {
tANI_U8 maxTxPower;
} tDot11fFfMaxTxPower;
@@ -419,36 +395,6 @@
void dot11fPackFfRCPI(tpAniSirGlobal, tDot11fFfRCPI*, tANI_U8*);
-typedef struct sDot11fFfRMCDialogToken {
- tANI_U32 token;
-} tDot11fFfRMCDialogToken;
-
-#define DOT11F_FF_RMCDIALOGTOKEN_LEN ( 4 )
-
-void dot11fUnpackFfRMCDialogToken(tpAniSirGlobal, tANI_U8*, tDot11fFfRMCDialogToken*);
-
-void dot11fPackFfRMCDialogToken(tpAniSirGlobal, tDot11fFfRMCDialogToken*, tANI_U8*);
-
-typedef struct sDot11fFfRMCOUI {
- tANI_U8 oui[3];
-} tDot11fFfRMCOUI;
-
-#define DOT11F_FF_RMCOUI_LEN ( 3 )
-
-void dot11fUnpackFfRMCOUI(tpAniSirGlobal, tANI_U8*, tDot11fFfRMCOUI*);
-
-void dot11fPackFfRMCOUI(tpAniSirGlobal, tDot11fFfRMCOUI*, tANI_U8*);
-
-typedef struct sDot11fFfRMCVersion {
- tANI_U8 version;
-} tDot11fFfRMCVersion;
-
-#define DOT11F_FF_RMCVERSION_LEN ( 1 )
-
-void dot11fUnpackFfRMCVersion(tpAniSirGlobal, tANI_U8*, tDot11fFfRMCVersion*);
-
-void dot11fPackFfRMCVersion(tpAniSirGlobal, tDot11fFfRMCVersion*, tANI_U8*);
-
typedef struct sDot11fFfRSNI {
tANI_U8 rsni;
} tDot11fFfRSNI;
@@ -5034,6 +4980,32 @@
#ifdef __cplusplus
}; /* End extern "C". */
#endif /* C++ */
+// EID 110 (0x6e)
+typedef struct sDot11fIEQosMapSet {
+ tANI_U8 present;
+ tANI_U8 num_dscp_exceptions;
+ tANI_U8 dscp_exceptions[60];
+} tDot11fIEQosMapSet;
+
+#define DOT11F_EID_QOSMAPSET ( 110 )
+
+// N.B. These #defines do *not* include the EID & length
+#define DOT11F_IE_QOSMAPSET_MIN_LEN ( 0 )
+
+#define DOT11F_IE_QOSMAPSET_MAX_LEN ( 60 )
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* C++ */
+tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEQosMapSet*);
+
+tANI_U32 dot11fPackIeQosMapSet(tpAniSirGlobal, tDot11fIEQosMapSet*, tANI_U8*, tANI_U32, tANI_U32*);
+
+tANI_U32 dot11fGetPackedIEQosMapSet(tpAniSirGlobal, tDot11fIEQosMapSet*, tANI_U32*);
+
+#ifdef __cplusplus
+}; /* End extern "C". */
+#endif /* C++ */
// EID 40 (0x28)
typedef struct sDot11fIEQuiet {
tANI_U8 present;
@@ -6301,6 +6273,7 @@
tDot11fIEVHTCaps VHTCaps;
tDot11fIEExtCap ExtCap;
tDot11fIEOperatingMode OperatingMode;
+ tDot11fIEQosMapSet QosMapSet;
} tDot11fAssocRequest;
#define DOT11F_ASSOCREQUEST ( 5 )
@@ -6349,6 +6322,7 @@
tDot11fIEVHTOperation VHTOperation;
tDot11fIEExtCap ExtCap;
tDot11fIEOBSSScanParameters OBSSScanParameters;
+ tDot11fIEQosMapSet QosMapSet;
} tDot11fAssocResponse;
#define DOT11F_ASSOCRESPONSE ( 6 )
@@ -7232,25 +7206,21 @@
} /* End extern "C". */
#endif /* C++ */
-typedef struct sDot11fRMC{
- tDot11fFfCategory Category;
- tDot11fFfRMCOUI RMCOUI;
- tDot11fFfMagicCode MagicCode;
- tDot11fFfRMCVersion RMCVersion;
- tDot11fFfAction Action;
- tDot11fFfRMCDialogToken RMCDialogToken;
- tDot11fFfLeader Leader;
-} tDot11fRMC;
+typedef struct sDot11fQosMapConfigure{
+ tDot11fFfCategory Category;
+ tDot11fFfAction Action;
+ tDot11fIEQosMapSet QosMapSet;
+} tDot11fQosMapConfigure;
-#define DOT11F_RMC ( 39 )
+#define DOT11F_QOSMAPCONFIGURE ( 39 )
#ifdef __cplusplus
extern "C" {
#endif /* C++ */
-tANI_U32 dot11fUnpackRMC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fRMC *pFrm);
-tANI_U32 dot11fPackRMC(tpAniSirGlobal pCtx, tDot11fRMC *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed);
-tANI_U32 dot11fGetPackedRMCSize(tpAniSirGlobal pCtx, tDot11fRMC *pFrm, tANI_U32 *pnNeeded);
+tANI_U32 dot11fUnpackQosMapConfigure(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fQosMapConfigure *pFrm);
+tANI_U32 dot11fPackQosMapConfigure(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed);
+tANI_U32 dot11fGetPackedQosMapConfigureSize(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U32 *pnNeeded);
#ifdef __cplusplus
} /* End extern "C". */
@@ -7335,6 +7305,7 @@
tDot11fIEVHTCaps VHTCaps;
tDot11fIEExtCap ExtCap;
tDot11fIEOperatingMode OperatingMode;
+ tDot11fIEQosMapSet QosMapSet;
} tDot11fReAssocRequest;
#define DOT11F_REASSOCREQUEST ( 42 )
@@ -7384,6 +7355,7 @@
tDot11fIEVHTOperation VHTOperation;
tDot11fIEExtCap ExtCap;
tDot11fIEOBSSScanParameters OBSSScanParameters;
+ tDot11fIEQosMapSet QosMapSet;
} tDot11fReAssocResponse;
#define DOT11F_REASSOCRESPONSE ( 43 )
diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h
index b6a0086..d313d29 100644
--- a/CORE/MAC/src/include/parserApi.h
+++ b/CORE/MAC/src/include/parserApi.h
@@ -420,6 +420,11 @@
tANI_U8 *frame,
tANI_U32 len,
tSirDeltsReqInfo *delTs);
+tSirRetStatus
+sirConvertQosMapConfigureFrame2Struct(tpAniSirGlobal pMac,
+ tANI_U8 *pFrame,
+ tANI_U32 nFrame,
+ tSirQosMapSet *pQosMapSet);
#ifdef ANI_SUPPORT_11H
tSirRetStatus
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index d6ed752..2927a5c 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -853,6 +853,27 @@
}
+static void
+__limProcessQosMapConfigureFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
+ tpPESession psessionEntry)
+{
+ tpSirMacMgmtHdr pHdr;
+ tANI_U32 frameLen;
+ tANI_U8 *pBody;
+ tSirRetStatus retval;
+ pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
+ pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
+ frameLen = WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
+ retval = sirConvertQosMapConfigureFrame2Struct(pMac, pBody, frameLen,
+ &pMac->QosMapSet);
+ if (retval != eSIR_SUCCESS)
+ {
+ PELOGW(limLog(pMac, LOGE,
+ FL("QosMapConfigure frame parsing failed (error %d)"), retval);)
+ return;
+ }
+ limSendSmeMgmtFrameInd(pMac, 0, pRxPacketInfo, psessionEntry, 0);
+}
#ifdef ANI_SUPPORT_11H
/**
@@ -1975,6 +1996,9 @@
__limProcessDelTsReq(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
break;
+ case SIR_MAC_QOS_MAP_CONFIGURE:
+ __limProcessQosMapConfigureFrame(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
+ break;
default:
PELOGE(limLog(pMac, LOGE, FL("Qos action %d not handled"), pActionHdr->actionID);)
break;
@@ -2048,6 +2072,10 @@
__limProcessDelTsReq(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
break;
+ case SIR_MAC_QOS_MAP_CONFIGURE:
+ __limProcessQosMapConfigureFrame(pMac, (tANI_U8 *) pRxPacketInfo,psessionEntry);
+ break;
+
default:
PELOGE(limLog(pMac, LOGE, FL("WME action %d not handled"), pActionHdr->actionID);)
break;
diff --git a/CORE/SME/inc/sme_QosApi.h b/CORE/SME/inc/sme_QosApi.h
index 0c27504..2c91774 100644
--- a/CORE/SME/inc/sme_QosApi.h
+++ b/CORE/SME/inc/sme_QosApi.h
@@ -379,4 +379,14 @@
void sme_QosUpdateHandOff(v_U8_t sessionId,
v_BOOL_t updateHandOff);
+
+/*--------------------------------------------------------------------------
+ \brief sme_UpdateDSCPtoUPMapping() - Function which can be called to update
+ qos mapping table maintained in HDD
+ \param hHal - The handle returned by macOpen.
+ \param dscpmapping - pointer to the qos mapping structure in HDD
+
+ \sa
+-------------------------------------------------------------------------*/
+VOS_STATUS sme_UpdateDSCPtoUPMapping( tHalHandle hHal, sme_QosWmmUpType* dscpmapping);
#endif //#if !defined( __SME_QOSAPI_H )
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 27edb39..19be773 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -10422,3 +10422,54 @@
return (status);
}
+VOS_STATUS sme_UpdateDSCPtoUPMapping( tHalHandle hHal,
+ sme_QosWmmUpType *dscpmapping)
+{
+ tpAniSirGlobal pMac = PMAC_STRUCT( hHal );
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+ v_U8_t i, j;
+ status = sme_AcquireGlobalLock( &pMac->sme );
+ if ( HAL_STATUS_SUCCESS( status ) )
+ {
+ if ( !pMac->QosMapSet.present )
+ {
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: QOS Mapping IE not present", __func__);
+ sme_ReleaseGlobalLock( &pMac->sme);
+ return eHAL_STATUS_FAILURE;
+ }
+ else
+ {
+ for (i=0; i < 8; i++)
+ {
+ for (j = pMac->QosMapSet.dscp_range[i][0];
+ j <= pMac->QosMapSet.dscp_range[i][1]; j++)
+ {
+ if ((pMac->QosMapSet.dscp_range[i][0] == 255) &&
+ (pMac->QosMapSet.dscp_range[i][1] == 255))
+ {
+ dscpmapping[j]= 0;
+ VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR,
+ "%s: User Priority %d is not used in mapping",
+ __func__, i);
+ break;
+ }
+ else
+ {
+ dscpmapping[j]= i;
+ }
+ }
+ }
+ for (i=0; i< pMac->QosMapSet.num_dscp_exceptions; i++)
+ {
+ if (pMac->QosMapSet.dscp_exceptions[i][0] != 255)
+ {
+ dscpmapping[pMac->QosMapSet.dscp_exceptions[i][0] ] =
+ pMac->QosMapSet.dscp_exceptions[i][1];
+ }
+ }
+ }
+ }
+ sme_ReleaseGlobalLock( &pMac->sme);
+ return status;
+}
diff --git a/CORE/SYS/legacy/src/utils/inc/utilsParser.h b/CORE/SYS/legacy/src/utils/inc/utilsParser.h
index 100915d..cc651c8 100644
--- a/CORE/SYS/legacy/src/utils/inc/utilsParser.h
+++ b/CORE/SYS/legacy/src/utils/inc/utilsParser.h
@@ -73,6 +73,7 @@
#ifdef WLAN_FEATURE_WFD
tSirRetStatus ConvertWFDOpaque (tpAniSirGlobal, tSirAddie*, tDot11fIEWFDIEOpaque*);
#endif
+void ConvertQosMapsetFrame(tpAniSirGlobal, tSirQosMapSet*, tDot11fIEQosMapSet*);
#endif
diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c
index 9617bc5..41270b3 100644
--- a/CORE/SYS/legacy/src/utils/src/dot11f.c
+++ b/CORE/SYS/legacy/src/utils/src/dot11f.c
@@ -19,15 +19,11 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/*
- * Copyright (c) 2012 - 2014 Qualcomm Atheros, Inc.
- * All Rights Reserved.
- * Qualcomm Atheros Confidential and Proprietary.
- *
- */
-
-
-
+/**
+ * Copyright (c) 2012 - 2014 Qualcomm Atheros, Inc.
+ * All Rights Reserved.
+ * Qualcomm Atheros Confidential and Proprietary.
+ */
/**
* \file dot11f.c
@@ -39,7 +35,7 @@
*
*
* This file was automatically generated by 'framesc'
- * Wed Feb 26 16:47:37 2014 from the following file(s):
+ * Wed Apr 16 11:21:06 2014 from the following file(s):
*
* dot11f.frms
*
@@ -762,16 +758,6 @@
#define SigFfDialogToken ( 0x000d )
-void dot11fUnpackFfLeader(tpAniSirGlobal pCtx,
- tANI_U8 *pBuf,
- tDot11fFfLeader *pDst)
-{
- DOT11F_MEMCPY(pCtx, pDst->mac, pBuf, 6);
- (void)pCtx;
-} /* End dot11fUnpackFfLeader. */
-
-#define SigFfLeader ( 0x000e )
-
void dot11fUnpackFfLinkMargin(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
tDot11fFfLinkMargin *pDst)
@@ -780,19 +766,9 @@
(void)pCtx;
} /* End dot11fUnpackFfLinkMargin. */
-#define SigFfLinkMargin ( 0x000f )
+#define SigFfLinkMargin ( 0x000e )
-#define SigFfListenInterval ( 0x0010 )
-
-void dot11fUnpackFfMagicCode(tpAniSirGlobal pCtx,
- tANI_U8 *pBuf,
- tDot11fFfMagicCode *pDst)
-{
- DOT11F_MEMCPY(pCtx, pDst->magic, pBuf, 6);
- (void)pCtx;
-} /* End dot11fUnpackFfMagicCode. */
-
-#define SigFfMagicCode ( 0x0011 )
+#define SigFfListenInterval ( 0x000f )
void dot11fUnpackFfMaxTxPower(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -802,7 +778,7 @@
(void)pCtx;
} /* End dot11fUnpackFfMaxTxPower. */
-#define SigFfMaxTxPower ( 0x0012 )
+#define SigFfMaxTxPower ( 0x0010 )
void dot11fUnpackFfNumOfRepetitions(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -812,7 +788,7 @@
(void)pCtx;
} /* End dot11fUnpackFfNumOfRepetitions. */
-#define SigFfNumOfRepetitions ( 0x0013 )
+#define SigFfNumOfRepetitions ( 0x0011 )
void dot11fUnpackFfOperatingMode(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -827,7 +803,7 @@
(void)pCtx;
} /* End dot11fUnpackFfOperatingMode. */
-#define SigFfOperatingMode ( 0x0014 )
+#define SigFfOperatingMode ( 0x0012 )
void dot11fUnpackFfP2POUI(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -837,7 +813,7 @@
(void)pCtx;
} /* End dot11fUnpackFfP2POUI. */
-#define SigFfP2POUI ( 0x0015 )
+#define SigFfP2POUI ( 0x0013 )
void dot11fUnpackFfP2POUISubType(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -847,7 +823,7 @@
(void)pCtx;
} /* End dot11fUnpackFfP2POUISubType. */
-#define SigFfP2POUISubType ( 0x0016 )
+#define SigFfP2POUISubType ( 0x0014 )
void dot11fUnpackFfRCPI(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -857,37 +833,7 @@
(void)pCtx;
} /* End dot11fUnpackFfRCPI. */
-#define SigFfRCPI ( 0x0017 )
-
-void dot11fUnpackFfRMCDialogToken(tpAniSirGlobal pCtx,
- tANI_U8 *pBuf,
- tDot11fFfRMCDialogToken *pDst)
-{
- framesntohl(pCtx, &pDst->token, pBuf, 0);
- (void)pCtx;
-} /* End dot11fUnpackFfRMCDialogToken. */
-
-#define SigFfRMCDialogToken ( 0x0018 )
-
-void dot11fUnpackFfRMCOUI(tpAniSirGlobal pCtx,
- tANI_U8 *pBuf,
- tDot11fFfRMCOUI *pDst)
-{
- DOT11F_MEMCPY(pCtx, pDst->oui, pBuf, 3);
- (void)pCtx;
-} /* End dot11fUnpackFfRMCOUI. */
-
-#define SigFfRMCOUI ( 0x0019 )
-
-void dot11fUnpackFfRMCVersion(tpAniSirGlobal pCtx,
- tANI_U8 *pBuf,
- tDot11fFfRMCVersion *pDst)
-{
- pDst->version = *pBuf;
- (void)pCtx;
-} /* End dot11fUnpackFfRMCVersion. */
-
-#define SigFfRMCVersion ( 0x001a )
+#define SigFfRCPI ( 0x0015 )
void dot11fUnpackFfRSNI(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -897,9 +843,9 @@
(void)pCtx;
} /* End dot11fUnpackFfRSNI. */
-#define SigFfRSNI ( 0x001b )
+#define SigFfRSNI ( 0x0016 )
-#define SigFfReason ( 0x001c )
+#define SigFfReason ( 0x0017 )
void dot11fUnpackFfRxAntennaId(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -909,7 +855,7 @@
(void)pCtx;
} /* End dot11fUnpackFfRxAntennaId. */
-#define SigFfRxAntennaId ( 0x001d )
+#define SigFfRxAntennaId ( 0x0018 )
void dot11fUnpackFfSMPowerModeSet(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -923,9 +869,9 @@
(void)pCtx;
} /* End dot11fUnpackFfSMPowerModeSet. */
-#define SigFfSMPowerModeSet ( 0x001e )
+#define SigFfSMPowerModeSet ( 0x0019 )
-#define SigFfStatus ( 0x001f )
+#define SigFfStatus ( 0x001a )
void dot11fUnpackFfStatusCode(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -935,7 +881,7 @@
(void)pCtx;
} /* End dot11fUnpackFfStatusCode. */
-#define SigFfStatusCode ( 0x0020 )
+#define SigFfStatusCode ( 0x001b )
void dot11fUnpackFfTPCEleID(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -945,7 +891,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTPCEleID. */
-#define SigFfTPCEleID ( 0x0021 )
+#define SigFfTPCEleID ( 0x001c )
void dot11fUnpackFfTPCEleLen(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -955,7 +901,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTPCEleLen. */
-#define SigFfTPCEleLen ( 0x0022 )
+#define SigFfTPCEleLen ( 0x001d )
void dot11fUnpackFfTSInfo(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -976,7 +922,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTSInfo. */
-#define SigFfTSInfo ( 0x0023 )
+#define SigFfTSInfo ( 0x001e )
void dot11fUnpackFfTimeStamp(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -986,7 +932,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTimeStamp. */
-#define SigFfTimeStamp ( 0x0024 )
+#define SigFfTimeStamp ( 0x001f )
void dot11fUnpackFfTransactionId(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -996,7 +942,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTransactionId. */
-#define SigFfTransactionId ( 0x0025 )
+#define SigFfTransactionId ( 0x0020 )
void dot11fUnpackFfTxAntennaId(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -1006,7 +952,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTxAntennaId. */
-#define SigFfTxAntennaId ( 0x0026 )
+#define SigFfTxAntennaId ( 0x0021 )
void dot11fUnpackFfTxPower(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -1016,7 +962,7 @@
(void)pCtx;
} /* End dot11fUnpackFfTxPower. */
-#define SigFfTxPower ( 0x0027 )
+#define SigFfTxPower ( 0x0022 )
void dot11fUnpackFfVhtMembershipStatusArray(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -1026,7 +972,7 @@
(void)pCtx;
} /* End dot11fUnpackFfVhtMembershipStatusArray. */
-#define SigFfVhtMembershipStatusArray ( 0x0028 )
+#define SigFfVhtMembershipStatusArray ( 0x0023 )
void dot11fUnpackFfVhtUserPositionArray(tpAniSirGlobal pCtx,
tANI_U8 *pBuf,
@@ -1036,7 +982,7 @@
(void)pCtx;
} /* End dot11fUnpackFfVhtUserPositionArray. */
-#define SigFfVhtUserPositionArray ( 0x0029 )
+#define SigFfVhtUserPositionArray ( 0x0024 )
tANI_U32 dot11fUnpackTlvAuthorizedMACs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U16 tlvlen, tDot11fTLVAuthorizedMACs *pDst)
{
@@ -4524,6 +4470,26 @@
#define SigIeQOSCapsStation ( 0x0068 )
+tANI_U32 dot11fUnpackIeQosMapSet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQosMapSet *pDst)
+{
+ tANI_U32 status = DOT11F_PARSE_SUCCESS;
+ (void) pBuf; (void)ielen; /* Shutup the compiler */
+ if (pDst->present) status = DOT11F_DUPLICATE_IE;
+ pDst->present = 1;
+ pDst->num_dscp_exceptions = (tANI_U8)( ielen );
+ if (ielen > 60){
+ pDst->present = 0;
+ return DOT11F_SKIPPED_BAD_IE;
+ }
+
+ DOT11F_MEMCPY(pCtx, pDst->dscp_exceptions, pBuf, ( ielen ) );
+ (void)pCtx;
+ return status;
+} /* End dot11fUnpackIeQosMapSet. */
+
+#define SigIeQosMapSet ( 0x0069 )
+
+
tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQuiet *pDst)
{
tANI_U32 status = DOT11F_PARSE_SUCCESS;
@@ -4544,7 +4510,7 @@
return status;
} /* End dot11fUnpackIeQuiet. */
-#define SigIeQuiet ( 0x0069 )
+#define SigIeQuiet ( 0x006a )
tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERCPIIE *pDst)
@@ -4558,7 +4524,7 @@
return status;
} /* End dot11fUnpackIeRCPIIE. */
-#define SigIeRCPIIE ( 0x006a )
+#define SigIeRCPIIE ( 0x006b )
static const tFFDefn FFS_RICDataDesc[ ] = {
@@ -4598,7 +4564,7 @@
return status;
} /* End dot11fUnpackIeRICDataDesc. */
-#define SigIeRICDataDesc ( 0x006b )
+#define SigIeRICDataDesc ( 0x006c )
tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSN *pDst)
@@ -4701,7 +4667,7 @@
return status;
} /* End dot11fUnpackIeRSN. */
-#define SigIeRSN ( 0x006c )
+#define SigIeRSN ( 0x006d )
tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNIIE *pDst)
@@ -4715,7 +4681,7 @@
return status;
} /* End dot11fUnpackIeRSNIIE. */
-#define SigIeRSNIIE ( 0x006d )
+#define SigIeRSNIIE ( 0x006e )
tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNOpaque *pDst)
@@ -4735,7 +4701,7 @@
return status;
} /* End dot11fUnpackIeRSNOpaque. */
-#define SigIeRSNOpaque ( 0x006e )
+#define SigIeRSNOpaque ( 0x006f )
tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppChannels *pDst)
@@ -4755,7 +4721,7 @@
return status;
} /* End dot11fUnpackIeSuppChannels. */
-#define SigIeSuppChannels ( 0x006f )
+#define SigIeSuppChannels ( 0x0070 )
tANI_U32 dot11fUnpackIeSuppOperatingClasses(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppOperatingClasses *pDst)
@@ -4775,7 +4741,7 @@
return status;
} /* End dot11fUnpackIeSuppOperatingClasses. */
-#define SigIeSuppOperatingClasses ( 0x0070 )
+#define SigIeSuppOperatingClasses ( 0x0071 )
tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppRates *pDst)
@@ -4803,7 +4769,7 @@
return status;
} /* End dot11fUnpackIeSuppRates. */
-#define SigIeSuppRates ( 0x0071 )
+#define SigIeSuppRates ( 0x0072 )
tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETIM *pDst)
@@ -4832,7 +4798,7 @@
return status;
} /* End dot11fUnpackIeTIM. */
-#define SigIeTIM ( 0x0072 )
+#define SigIeTIM ( 0x0073 )
tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCReport *pDst)
@@ -4849,7 +4815,7 @@
return status;
} /* End dot11fUnpackIeTPCReport. */
-#define SigIeTPCReport ( 0x0073 )
+#define SigIeTPCReport ( 0x0074 )
tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCRequest *pDst)
@@ -4862,7 +4828,7 @@
return status;
} /* End dot11fUnpackIeTPCRequest. */
-#define SigIeTPCRequest ( 0x0074 )
+#define SigIeTPCRequest ( 0x0075 )
tANI_U32 dot11fUnpackIeTimeoutInterval(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETimeoutInterval *pDst)
@@ -4879,7 +4845,7 @@
return status;
} /* End dot11fUnpackIeTimeoutInterval. */
-#define SigIeTimeoutInterval ( 0x0075 )
+#define SigIeTimeoutInterval ( 0x0076 )
tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst)
@@ -4932,7 +4898,7 @@
return status;
} /* End dot11fUnpackIeVHTCaps. */
-#define SigIeVHTCaps ( 0x0076 )
+#define SigIeVHTCaps ( 0x0077 )
tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTExtBssLoad *pDst)
@@ -4958,7 +4924,7 @@
return status;
} /* End dot11fUnpackIeVHTExtBssLoad. */
-#define SigIeVHTExtBssLoad ( 0x0077 )
+#define SigIeVHTExtBssLoad ( 0x0078 )
tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTOperation *pDst)
@@ -4981,7 +4947,7 @@
return status;
} /* End dot11fUnpackIeVHTOperation. */
-#define SigIeVHTOperation ( 0x0078 )
+#define SigIeVHTOperation ( 0x0079 )
tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst)
@@ -5050,7 +5016,7 @@
return status;
} /* End dot11fUnpackIeWAPI. */
-#define SigIeWAPI ( 0x0079 )
+#define SigIeWAPI ( 0x007a )
tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPIOpaque *pDst)
@@ -5070,7 +5036,7 @@
return status;
} /* End dot11fUnpackIeWAPIOpaque. */
-#define SigIeWAPIOpaque ( 0x007a )
+#define SigIeWAPIOpaque ( 0x007b )
tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFATPC *pDst)
@@ -5087,7 +5053,7 @@
return status;
} /* End dot11fUnpackIeWFATPC. */
-#define SigIeWFATPC ( 0x007b )
+#define SigIeWFATPC ( 0x007c )
tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFDIEOpaque *pDst)
@@ -5107,7 +5073,7 @@
return status;
} /* End dot11fUnpackIeWFDIEOpaque. */
-#define SigIeWFDIEOpaque ( 0x007c )
+#define SigIeWFDIEOpaque ( 0x007d )
tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst)
@@ -5135,7 +5101,7 @@
return status;
} /* End dot11fUnpackIeWMMCaps. */
-#define SigIeWMMCaps ( 0x007d )
+#define SigIeWMMCaps ( 0x007e )
tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst)
@@ -5156,7 +5122,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoAp. */
-#define SigIeWMMInfoAp ( 0x007e )
+#define SigIeWMMInfoAp ( 0x007f )
tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst)
@@ -5181,7 +5147,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoStation. */
-#define SigIeWMMInfoStation ( 0x007f )
+#define SigIeWMMInfoStation ( 0x0080 )
tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst)
@@ -5274,7 +5240,7 @@
return status;
} /* End dot11fUnpackIeWMMParams. */
-#define SigIeWMMParams ( 0x0080 )
+#define SigIeWMMParams ( 0x0081 )
tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPA *pDst)
@@ -5356,7 +5322,7 @@
return status;
} /* End dot11fUnpackIeWPA. */
-#define SigIeWPA ( 0x0081 )
+#define SigIeWPA ( 0x0082 )
tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPAOpaque *pDst)
@@ -5376,7 +5342,7 @@
return status;
} /* End dot11fUnpackIeWPAOpaque. */
-#define SigIeWPAOpaque ( 0x0082 )
+#define SigIeWPAOpaque ( 0x0083 )
static const tTLVDefn TLVS_WSC[ ] = {
@@ -5414,7 +5380,7 @@
return status;
} /* End dot11fUnpackIeWSC. */
-#define SigIeWSC ( 0x0083 )
+#define SigIeWSC ( 0x0084 )
tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWiderBWChanSwitchAnn *pDst)
@@ -5434,7 +5400,7 @@
return status;
} /* End dot11fUnpackIeWiderBWChanSwitchAnn. */
-#define SigIeWiderBWChanSwitchAnn ( 0x0084 )
+#define SigIeWiderBWChanSwitchAnn ( 0x0085 )
static const tTLVDefn TLVS_WscAssocReq[ ] = {
@@ -5453,7 +5419,7 @@
return status;
} /* End dot11fUnpackIeWscAssocReq. */
-#define SigIeWscAssocReq ( 0x0085 )
+#define SigIeWscAssocReq ( 0x0086 )
static const tTLVDefn TLVS_WscAssocRes[ ] = {
@@ -5472,7 +5438,7 @@
return status;
} /* End dot11fUnpackIeWscAssocRes. */
-#define SigIeWscAssocRes ( 0x0086 )
+#define SigIeWscAssocRes ( 0x0087 )
static const tTLVDefn TLVS_WscBeacon[ ] = {
@@ -5497,7 +5463,7 @@
return status;
} /* End dot11fUnpackIeWscBeacon. */
-#define SigIeWscBeacon ( 0x0087 )
+#define SigIeWscBeacon ( 0x0088 )
static const tTLVDefn TLVS_WscBeaconProbeRes[ ] = {
@@ -5530,7 +5496,7 @@
return status;
} /* End dot11fUnpackIeWscBeaconProbeRes. */
-#define SigIeWscBeaconProbeRes ( 0x0088 )
+#define SigIeWscBeaconProbeRes ( 0x0089 )
tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWscIEOpaque *pDst)
@@ -5550,7 +5516,7 @@
return status;
} /* End dot11fUnpackIeWscIEOpaque. */
-#define SigIeWscIEOpaque ( 0x0089 )
+#define SigIeWscIEOpaque ( 0x008a )
static const tTLVDefn TLVS_WscProbeReq[ ] = {
@@ -5581,7 +5547,7 @@
return status;
} /* End dot11fUnpackIeWscProbeReq. */
-#define SigIeWscProbeReq ( 0x008a )
+#define SigIeWscProbeReq ( 0x008b )
static const tTLVDefn TLVS_WscProbeRes[ ] = {
@@ -5614,7 +5580,7 @@
return status;
} /* End dot11fUnpackIeWscProbeRes. */
-#define SigIeWscProbeRes ( 0x008b )
+#define SigIeWscProbeRes ( 0x008c )
static const tTLVDefn TLVS_WscReassocRes[ ] = {
@@ -5633,7 +5599,7 @@
return status;
} /* End dot11fUnpackIeWscReassocRes. */
-#define SigIeWscReassocRes ( 0x008c )
+#define SigIeWscReassocRes ( 0x008d )
static const tFFDefn FFS_AddBAReq[] = {
@@ -6292,6 +6258,7 @@
{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, 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, }, };
tANI_U32 dot11fUnpackAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAssocRequest *pFrm)
@@ -6923,6 +6890,16 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -6963,6 +6940,7 @@
{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, 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, }, };
tANI_U32 dot11fUnpackAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fAssocResponse *pFrm)
@@ -8106,6 +8084,16 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -15586,52 +15574,48 @@
} /* End dot11fUnpackProvisionDiscoveryRes. */
- static const tFFDefn FFS_RMC[] = {
- { "Category", offsetof(tDot11fRMC, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, },
- { "RMCOUI", offsetof(tDot11fRMC, RMCOUI), SigFfRMCOUI , DOT11F_FF_RMCOUI_LEN, },
- { "MagicCode", offsetof(tDot11fRMC, MagicCode), SigFfMagicCode , DOT11F_FF_MAGICCODE_LEN, },
- { "RMCVersion", offsetof(tDot11fRMC, RMCVersion), SigFfRMCVersion , DOT11F_FF_RMCVERSION_LEN, },
- { "Action", offsetof(tDot11fRMC, Action), SigFfAction , DOT11F_FF_ACTION_LEN, },
- { "RMCDialogToken", offsetof(tDot11fRMC, RMCDialogToken), SigFfRMCDialogToken , DOT11F_FF_RMCDIALOGTOKEN_LEN, },
- { "Leader", offsetof(tDot11fRMC, Leader), SigFfLeader , DOT11F_FF_LEADER_LEN, },
+ static const tFFDefn FFS_QosMapConfigure[] = {
+ { "Category", offsetof(tDot11fQosMapConfigure, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, },
+ { "Action", offsetof(tDot11fQosMapConfigure, Action), SigFfAction , DOT11F_FF_ACTION_LEN, },
{ NULL, 0, 0, 0,},
};
- static const tIEDefn IES_RMC[] = {
+ static const tIEDefn IES_QosMapConfigure[] = {
+ {offsetof(tDot11fQosMapConfigure, QosMapSet), offsetof(tDot11fIEQosMapSet, present), 0, "QosMapSet" , 0, 2, 62, SigIeQosMapSet, {0, 0, 0, 0, 0}, 0, DOT11F_EID_QOSMAPSET, 1, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
-tANI_U32 dot11fUnpackRMC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fRMC *pFrm)
+tANI_U32 dot11fUnpackQosMapConfigure(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fQosMapConfigure *pFrm)
{
tANI_U32 i = 0;
tANI_U32 status = 0;
- status = UnpackCore(pCtx, pBuf, nBuf, FFS_RMC, IES_RMC, ( tANI_U8* )pFrm, sizeof(*pFrm));
+ status = UnpackCore(pCtx, pBuf, nBuf, FFS_QosMapConfigure, IES_QosMapConfigure, ( tANI_U8* )pFrm, sizeof(*pFrm));
(void)i;
# ifdef DOT11F_DUMP_FRAMES
if (!DOT11F_FAILED(status))
{
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Unpacked the RMC:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), pBuf, nBuf);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("to:\n"));
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Category:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Category.category, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCOUI:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCOUI.oui, 3);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("MagicCode:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->MagicCode.magic, 6);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCVersion:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCVersion.version, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Action:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Action.action, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCDialogToken:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCDialogToken.token, 4);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Leader:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Leader.mac, 6);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Unpacked the QosMapConfigure:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), pBuf, nBuf);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("to:\n"));
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Category:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Category.category, 1);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Action:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Action.action, 1);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
-} /* End dot11fUnpackRMC. */
+} /* End dot11fUnpackQosMapConfigure. */
static const tFFDefn FFS_RadioMeasurementReport[] = {
{ "Category", offsetof(tDot11fRadioMeasurementReport, Category), SigFfCategory , DOT11F_FF_CATEGORY_LEN, },
@@ -15852,6 +15836,7 @@
{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, 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, }, };
tANI_U32 dot11fUnpackReAssocRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fReAssocRequest *pFrm)
@@ -16870,6 +16855,16 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -16911,6 +16906,7 @@
{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, 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, }, };
tANI_U32 dot11fUnpackReAssocResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fReAssocResponse *pFrm)
@@ -18061,6 +18057,16 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -20378,18 +20384,12 @@
case SigFfDialogToken:
dot11fUnpackFfDialogToken(pCtx, pBufRemaining, ( tDot11fFfDialogToken* )(pFrm + pFf->offset ));
break;
- case SigFfLeader:
- dot11fUnpackFfLeader(pCtx, pBufRemaining, ( tDot11fFfLeader* )(pFrm + pFf->offset ));
- break;
case SigFfLinkMargin:
dot11fUnpackFfLinkMargin(pCtx, pBufRemaining, ( tDot11fFfLinkMargin* )(pFrm + pFf->offset ));
break;
case SigFfListenInterval:
dot11fUnpackFfCommonFunc(pCtx, pBufRemaining, (tANI_U16*)&((( tDot11fFfListenInterval* )(pFrm + pFf->offset ))->interval));
break;
- case SigFfMagicCode:
- dot11fUnpackFfMagicCode(pCtx, pBufRemaining, ( tDot11fFfMagicCode* )(pFrm + pFf->offset ));
- break;
case SigFfMaxTxPower:
dot11fUnpackFfMaxTxPower(pCtx, pBufRemaining, ( tDot11fFfMaxTxPower* )(pFrm + pFf->offset ));
break;
@@ -20408,15 +20408,6 @@
case SigFfRCPI:
dot11fUnpackFfRCPI(pCtx, pBufRemaining, ( tDot11fFfRCPI* )(pFrm + pFf->offset ));
break;
- case SigFfRMCDialogToken:
- dot11fUnpackFfRMCDialogToken(pCtx, pBufRemaining, ( tDot11fFfRMCDialogToken* )(pFrm + pFf->offset ));
- break;
- case SigFfRMCOUI:
- dot11fUnpackFfRMCOUI(pCtx, pBufRemaining, ( tDot11fFfRMCOUI* )(pFrm + pFf->offset ));
- break;
- case SigFfRMCVersion:
- dot11fUnpackFfRMCVersion(pCtx, pBufRemaining, ( tDot11fFfRMCVersion* )(pFrm + pFf->offset ));
- break;
case SigFfRSNI:
dot11fUnpackFfRSNI(pCtx, pBufRemaining, ( tDot11fFfRSNI* )(pFrm + pFf->offset ));
break;
@@ -20873,6 +20864,9 @@
case SigIeQOSCapsStation:
status |= dot11fUnpackIeQOSCapsStation(pCtx, pBufRemaining, len, ( tDot11fIEQOSCapsStation* )(pFrm + pIe->offset + sizeof(tDot11fIEQOSCapsStation)*countOffset) );
break;
+ case SigIeQosMapSet:
+ status |= dot11fUnpackIeQosMapSet(pCtx, pBufRemaining, len, ( tDot11fIEQosMapSet* )(pFrm + pIe->offset + sizeof(tDot11fIEQosMapSet)*countOffset) );
+ break;
case SigIeQuiet:
status |= dot11fUnpackIeQuiet(pCtx, pBufRemaining, len, ( tDot11fIEQuiet* )(pFrm + pIe->offset + sizeof(tDot11fIEQuiet)*countOffset) );
break;
@@ -21110,7 +21104,7 @@
FRAMES_LOG0( pCtx, FRLOGE, FRFL("This frame reports "
"fewer two byte(s) remaining.\n") );
status |= DOT11F_INCOMPLETE_TLV;
- FRAMES_DBG_BREAK();
+ FRAMES_DBG_BREAK();
goto MandatoryCheck;
}
pBufRemaining += 2;
@@ -22420,13 +22414,13 @@
return status;
} /* End dot11fGetPackedProvisionDiscoveryResSize. */
-tANI_U32 dot11fGetPackedRMCSize(tpAniSirGlobal pCtx, tDot11fRMC *pFrm, tANI_U32 *pnNeeded)
+tANI_U32 dot11fGetPackedQosMapConfigureSize(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U32 *pnNeeded)
{
tANI_U32 status = 0;
- *pnNeeded = 22;
- status = GetPackedSizeCore(pCtx, ( tANI_U8* )pFrm, pnNeeded, IES_RMC);
+ *pnNeeded = 2;
+ status = GetPackedSizeCore(pCtx, ( tANI_U8* )pFrm, pnNeeded, IES_QosMapConfigure);
return status;
-} /* End dot11fGetPackedRMCSize. */
+} /* End dot11fGetPackedQosMapConfigureSize. */
tANI_U32 dot11fGetPackedRadioMeasurementReportSize(tpAniSirGlobal pCtx, tDot11fRadioMeasurementReport *pFrm, tANI_U32 *pnNeeded)
{
@@ -23120,6 +23114,11 @@
byteCount = 1;
pIePresent = ( (tDot11fIEQOSCapsStation* )(pFrm + pIe->offset + offset * i ))->present;
break;
+ case SigIeQosMapSet:
+ offset = sizeof(tDot11fIEQosMapSet);
+ byteCount = ((tDot11fIEQosMapSet* )(pFrm + pIe->offset + sizeof(tDot11fIEQosMapSet) * i ))->num_dscp_exceptions;
+ pIePresent = ( (tDot11fIEQosMapSet* )(pFrm + pIe->offset + offset * i ))->present;
+ break;
case SigIeQuiet:
offset = sizeof(tDot11fIEQuiet);
byteCount = 6;
@@ -23658,14 +23657,6 @@
(void)pCtx;
} /* End dot11fPackFfDialogToken. */
-void dot11fPackFfLeader(tpAniSirGlobal pCtx,
- tDot11fFfLeader *pSrc,
- tANI_U8 *pBuf)
-{
- DOT11F_MEMCPY(pCtx, pBuf, pSrc->mac, 6);
- (void)pCtx;
-} /* End dot11fPackFfLeader. */
-
void dot11fPackFfLinkMargin(tpAniSirGlobal pCtx,
tDot11fFfLinkMargin *pSrc,
tANI_U8 *pBuf)
@@ -23682,14 +23673,6 @@
(void)pCtx;
} /* End dot11fPackFfListenInterval. */
-void dot11fPackFfMagicCode(tpAniSirGlobal pCtx,
- tDot11fFfMagicCode *pSrc,
- tANI_U8 *pBuf)
-{
- DOT11F_MEMCPY(pCtx, pBuf, pSrc->magic, 6);
- (void)pCtx;
-} /* End dot11fPackFfMagicCode. */
-
void dot11fPackFfMaxTxPower(tpAniSirGlobal pCtx,
tDot11fFfMaxTxPower *pSrc,
tANI_U8 *pBuf)
@@ -23744,30 +23727,6 @@
(void)pCtx;
} /* End dot11fPackFfRCPI. */
-void dot11fPackFfRMCDialogToken(tpAniSirGlobal pCtx,
- tDot11fFfRMCDialogToken *pSrc,
- tANI_U8 *pBuf)
-{
- frameshtonl(pCtx, pBuf, pSrc->token, 0);
- (void)pCtx;
-} /* End dot11fPackFfRMCDialogToken. */
-
-void dot11fPackFfRMCOUI(tpAniSirGlobal pCtx,
- tDot11fFfRMCOUI *pSrc,
- tANI_U8 *pBuf)
-{
- DOT11F_MEMCPY(pCtx, pBuf, pSrc->oui, 3);
- (void)pCtx;
-} /* End dot11fPackFfRMCOUI. */
-
-void dot11fPackFfRMCVersion(tpAniSirGlobal pCtx,
- tDot11fFfRMCVersion *pSrc,
- tANI_U8 *pBuf)
-{
- *pBuf = pSrc->version;
- (void)pCtx;
-} /* End dot11fPackFfRMCVersion. */
-
void dot11fPackFfRSNI(tpAniSirGlobal pCtx,
tDot11fFfRSNI *pSrc,
tANI_U8 *pBuf)
@@ -30102,6 +30061,36 @@
return DOT11F_PARSE_SUCCESS;
} /* End dot11fPackIeQOSCapsStation. */
+tANI_U32 dot11fPackIeQosMapSet(tpAniSirGlobal pCtx,
+ tDot11fIEQosMapSet *pSrc,
+ tANI_U8 *pBuf,
+ tANI_U32 nBuf,
+ tANI_U32 *pnConsumed)
+{
+ tANI_U8* pIeLen = 0;
+ tANI_U32 nConsumedOnEntry = *pnConsumed;
+ tANI_U32 nNeeded = 0U;
+ nNeeded += pSrc->num_dscp_exceptions;
+ while ( pSrc->present )
+ {
+ if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW;
+ *pBuf = 110;
+ ++pBuf; ++(*pnConsumed);
+ pIeLen = pBuf;
+ ++pBuf; ++(*pnConsumed);
+ DOT11F_MEMCPY(pCtx, pBuf, &( pSrc->dscp_exceptions ), pSrc->num_dscp_exceptions);
+ *pnConsumed += pSrc->num_dscp_exceptions;
+ // fieldsEndFlag = 1
+ break;
+ }
+ (void)pCtx;
+ if (pIeLen)
+ {
+ *pIeLen = *pnConsumed - nConsumedOnEntry - 2;
+ }
+ return DOT11F_PARSE_SUCCESS;
+} /* End dot11fPackIeQosMapSet. */
+
tANI_U32 dot11fPackIeQuiet(tpAniSirGlobal pCtx,
tDot11fIEQuiet *pSrc,
tANI_U8 *pBuf,
@@ -32886,6 +32875,16 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCREQUEST), pBuf, nBuf);
}
@@ -34034,6 +34033,16 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_ASSOCRESPONSE), pBuf, nBuf);
}
@@ -41004,39 +41013,39 @@
} /* End dot11fUnpackProvisionDiscoveryRes. */
-tANI_U32 dot11fPackRMC(tpAniSirGlobal pCtx, tDot11fRMC *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed)
+tANI_U32 dot11fPackQosMapConfigure(tpAniSirGlobal pCtx, tDot11fQosMapConfigure *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed)
{
tANI_U32 i = 0;
tANI_U32 status = 0;
(void)i;
*pnConsumed = 0U;
- status = PackCore(pCtx, (tANI_U8*)pFrm, pBuf, nBuf, pnConsumed, FFS_RMC, IES_RMC);
+ status = PackCore(pCtx, (tANI_U8*)pFrm, pBuf, nBuf, pnConsumed, FFS_QosMapConfigure, IES_QosMapConfigure);
# ifdef DOT11F_DUMP_FRAMES
if (!DOT11F_FAILED(status))
{
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Packed the RMC:\n"));
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Category:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Category.category, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCOUI:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCOUI.oui, 3);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("MagicCode:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->MagicCode.magic, 6);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCVersion:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCVersion.version, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Action:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Action.action, 1);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("RMCDialogToken:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->RMCDialogToken.token, 4);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("Leader:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), ( tANI_U8* )&pFrm->Leader.mac, 6);
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), FRFL("to:\n"));
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_RMC), pBuf, nBuf);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Packed the QosMapConfigure:\n"));
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Category:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Category.category, 1);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Action:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* )&pFrm->Action.action, 1);
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), FRFL("to:\n"));
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_QOSMAPCONFIGURE), pBuf, nBuf);
}
# endif // DOT11F_DUMP_FRAMES
return status;
-} /* End dot11fUnpackRMC. */
+} /* End dot11fUnpackQosMapConfigure. */
tANI_U32 dot11fPackRadioMeasurementReport(tpAniSirGlobal pCtx, tDot11fRadioMeasurementReport *pFrm, tANI_U8 *pBuf, tANI_U32 nBuf, tANI_U32 *pnConsumed)
{
@@ -42215,6 +42224,16 @@
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSS (3): %d\n"), pFrm->OperatingMode.rxNSS);
FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("rxNSSType (1): %d\n"), pFrm->OperatingMode.rxNSSType);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCREQUEST), pBuf, nBuf);
}
@@ -43370,6 +43389,16 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.bssWidthChannelTransitionDelayFactor, 2);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* )&pFrm->OBSSScanParameters.obssScanActivityThreshold, 2);
}
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("QosMapSet:\n"));
+ if (!pFrm->QosMapSet.present)
+ {
+ FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("Not present.\n"));
+ }
+ else
+ {
+ FRAMES_LOG1(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("num_dscp_exceptions: %d.\n"), pFrm->QosMapSet.num_dscp_exceptions);
+ FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), ( tANI_U8* ) pFrm->QosMapSet.dscp_exceptions, pFrm->QosMapSet.num_dscp_exceptions);
+ }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_REASSOCRESPONSE), pBuf, nBuf);
}
@@ -45444,18 +45473,12 @@
case SigFfDialogToken:
dot11fPackFfDialogToken(pCtx, (tDot11fFfDialogToken* )(pSrc + pFf->offset), pBufRemaining);
break;
- case SigFfLeader:
- dot11fPackFfLeader(pCtx, (tDot11fFfLeader* )(pSrc + pFf->offset), pBufRemaining);
- break;
case SigFfLinkMargin:
dot11fPackFfLinkMargin(pCtx, (tDot11fFfLinkMargin* )(pSrc + pFf->offset), pBufRemaining);
break;
case SigFfListenInterval:
dot11fPackFfListenInterval(pCtx, (tDot11fFfListenInterval* )(pSrc + pFf->offset), pBufRemaining);
break;
- case SigFfMagicCode:
- dot11fPackFfMagicCode(pCtx, (tDot11fFfMagicCode* )(pSrc + pFf->offset), pBufRemaining);
- break;
case SigFfMaxTxPower:
dot11fPackFfMaxTxPower(pCtx, (tDot11fFfMaxTxPower* )(pSrc + pFf->offset), pBufRemaining);
break;
@@ -45474,15 +45497,6 @@
case SigFfRCPI:
dot11fPackFfRCPI(pCtx, (tDot11fFfRCPI* )(pSrc + pFf->offset), pBufRemaining);
break;
- case SigFfRMCDialogToken:
- dot11fPackFfRMCDialogToken(pCtx, (tDot11fFfRMCDialogToken* )(pSrc + pFf->offset), pBufRemaining);
- break;
- case SigFfRMCOUI:
- dot11fPackFfRMCOUI(pCtx, (tDot11fFfRMCOUI* )(pSrc + pFf->offset), pBufRemaining);
- break;
- case SigFfRMCVersion:
- dot11fPackFfRMCVersion(pCtx, (tDot11fFfRMCVersion* )(pSrc + pFf->offset), pBufRemaining);
- break;
case SigFfRSNI:
dot11fPackFfRSNI(pCtx, (tDot11fFfRSNI* )(pSrc + pFf->offset), pBufRemaining);
break;
@@ -45874,6 +45888,9 @@
case SigIeQOSCapsStation:
status |= dot11fPackIeQOSCapsStation(pCtx, ( tDot11fIEQOSCapsStation* )(pSrc + pIe->offset + sizeof(tDot11fIEQOSCapsStation) * i ), pBufRemaining, nBufRemaining, &len);
break;
+ case SigIeQosMapSet:
+ status |= dot11fPackIeQosMapSet(pCtx, ( tDot11fIEQosMapSet* )(pSrc + pIe->offset + sizeof(tDot11fIEQosMapSet) * i ), pBufRemaining, nBufRemaining, &len);
+ break;
case SigIeQuiet:
status |= dot11fPackIeQuiet(pCtx, ( tDot11fIEQuiet* )(pSrc + pIe->offset + sizeof(tDot11fIEQuiet) * i ), pBufRemaining, nBufRemaining, &len);
break;
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 9a9a700..4381fe9 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -743,6 +743,26 @@
#endif /* DUMP_MGMT_CNTNTS */
}
+void limLogQosMapSet(tpAniSirGlobal pMac, tSirQosMapSet *pQosMapSet)
+{
+ tANI_U8 i;
+ limLog(pMac, LOG1, FL("num of dscp exceptions : %d"),
+ pQosMapSet->num_dscp_exceptions);
+ for (i=0; i < pQosMapSet->num_dscp_exceptions; i++)
+ {
+ limLog(pMac, LOG1, FL("dscp value: %d"),
+ pQosMapSet->dscp_exceptions[i][0]);
+ limLog(pMac, LOG1, FL("User priority value: %d"),
+ pQosMapSet->dscp_exceptions[i][1]);
+ }
+ for (i=0;i<8;i++)
+ {
+ limLog(pMac, LOG1, FL("dscp low for up %d: %d"),i,
+ pQosMapSet->dscp_range[i][0]);
+ limLog(pMac, LOG1, FL("dscp high for up %d: %d"),i,
+ pQosMapSet->dscp_range[i][1]);
+ }
+}
tSirRetStatus
PopulateDot11fVHTCaps(tpAniSirGlobal pMac,
@@ -2451,8 +2471,14 @@
vos_mem_copy( &pAssocRsp->OBSSScanParameters, &ar.OBSSScanParameters,
sizeof( tDot11fIEOBSSScanParameters));
}
+ if ( ar.QosMapSet.present )
+ {
+ pMac->QosMapSet.present = 1;
+ ConvertQosMapsetFrame( pMac, &pMac->QosMapSet, &ar.QosMapSet);
+ limLog( pMac, LOG1, FL("Received Assoc Response with Qos Map Set"));
+ limLogQosMapSet(pMac, &pMac->QosMapSet);
+ }
return eSIR_SUCCESS;
-
} // End sirConvertAssocRespFrame2Struct.
tSirRetStatus
@@ -3956,6 +3982,33 @@
} // End sirConvertDeltsReq2Struct.
+tSirRetStatus
+sirConvertQosMapConfigureFrame2Struct(tpAniSirGlobal pMac,
+ tANI_U8 *pFrame,
+ tANI_U32 nFrame,
+ tSirQosMapSet *pQosMapSet)
+{
+ tDot11fQosMapConfigure mapConfigure;
+ tANI_U32 status;
+ status = dot11fUnpackQosMapConfigure(pMac, pFrame, nFrame, &mapConfigure);
+ if ( DOT11F_FAILED( status ) )
+ {
+ dot11fLog(pMac, LOGE, FL("Failed to parse Qos Map Configure frame (0x%08x, %d bytes):\n"),
+ status, nFrame);
+ PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
+ return eSIR_FAILURE;
+ }
+ else if ( DOT11F_WARNED( status ) )
+ {
+ dot11fLog( pMac, LOGW, FL("There were warnings while unpacking Qos Map Configure frame (0x%08x, %d bytes):\n"),
+ status, nFrame );
+ PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
+ }
+ pQosMapSet->present = mapConfigure.QosMapSet.present;
+ ConvertQosMapsetFrame(pMac->hHdd, pQosMapSet, &mapConfigure.QosMapSet);
+ limLogQosMapSet(pMac, &pMac->QosMapSet);
+ return eSIR_SUCCESS;
+}
#ifdef ANI_SUPPORT_11H
tSirRetStatus
diff --git a/CORE/SYS/legacy/src/utils/src/utilsParser.c b/CORE/SYS/legacy/src/utils/src/utilsParser.c
index 7b61a0e..98b09b6 100644
--- a/CORE/SYS/legacy/src/utils/src/utilsParser.c
+++ b/CORE/SYS/legacy/src/utils/src/utilsParser.c
@@ -686,11 +686,25 @@
return;
}
-
-
-
-
-
+void ConvertQosMapsetFrame(tpAniSirGlobal pMac, tSirQosMapSet* Qos, tDot11fIEQosMapSet* dot11fIE)
+{
+ tANI_U8 i,j=0;
+ Qos->num_dscp_exceptions = (dot11fIE->num_dscp_exceptions - 16)/2;
+ for (i=0;i<Qos->num_dscp_exceptions;i++)
+ {
+ Qos->dscp_exceptions[i][0] = dot11fIE->dscp_exceptions[j];
+ j++;
+ Qos->dscp_exceptions[i][1] = dot11fIE->dscp_exceptions[j];
+ j++;
+ }
+ for (i=0;i<8;i++)
+ {
+ Qos->dscp_range[i][0] = dot11fIE->dscp_exceptions[j];
+ j++;
+ Qos->dscp_range[i][1] = dot11fIE->dscp_exceptions[j];
+ j++;
+ }
+}
/**
@brief : This functions creates a DATA_NULL/CTS2SELF frame in Big endian format