(Reverting open source) Advertising proprietary IE (IBSS only)
Populating the prop IE (Oxygen network) in Beacon and
probe response frames sent by IBSS network only. An option is
provided in ini file to enable/disable populating the IE.
NOTE : Below CR is reverted with this gerrit
CRs-fixed: 509388
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index fe0899d..758ae02 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -282,12 +282,6 @@
#define CFG_ENABLE_ADAPT_RX_DRAIN_MAX WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX
#define CFG_ENABLE_ADAPT_RX_DRAIN_DEFAULT WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF
-//Enable Prop IE
-#define CFG_ENABLE_OXYNWK_NAME "gEnableOxygenNwk"
-#define CFG_ENABLE_OXYNWK_MIN ( 0 )
-#define CFG_ENABLE_OXYNWK_MAX ( 1 )
-#define CFG_ENABLE_OXYNWK_DEFAULT ( 0 )
-
typedef enum
{
eHDD_DOT11_MODE_AUTO = 0, //covers all things we support
@@ -2310,7 +2304,6 @@
//splitscan
//Traffic monitor timer for split scan
v_U32_t trafficMntrTmrForSplitScan;
- v_BOOL_t enableOxygenNwk;
v_U8_t flexConnectPowerFactor;
v_BOOL_t enableIbssHeartBeatOffload;
v_U32_t antennaDiversity;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 66dda34..921c174 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -2699,13 +2699,6 @@
CFG_SPLIT_SCAN_TRAFFIC_MONITOR_TIMER_MIN,
CFG_SPLIT_SCAN_TRAFFIC_MONITOR_TIMER_MAX ),
- REG_VARIABLE( CFG_ENABLE_OXYNWK_NAME, WLAN_PARAM_Integer,
- hdd_config_t, enableOxygenNwk,
- VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
- CFG_ENABLE_OXYNWK_DEFAULT,
- CFG_ENABLE_OXYNWK_MIN,
- CFG_ENABLE_OXYNWK_MAX ),
-
REG_VARIABLE( CFG_FLEX_CONNECT_POWER_FACTOR_NAME, WLAN_PARAM_Integer,
hdd_config_t, flexConnectPowerFactor,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_MINMAX,
@@ -4518,9 +4511,6 @@
smeConfig.csrConfig.enableTxLdpc = pConfig->enableTxLdpc;
- // Prop IE enabling/disabling option
- smeConfig.csrConfig.enableOxygenNwk = pConfig->enableOxygenNwk;
-
/* update SSR config */
sme_UpdateEnableSSR((tHalHandle)(pHddCtx->hHal), pHddCtx->cfg_ini->enableSSR);
/* Update the Directed scan offload setting */
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index e12e10c..02f1f3d 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -647,8 +647,6 @@
tANI_U8 txLdpcIniFeatureEnabled;
- tANI_U8 oxygenNwkIniFeatureEnabled;
-
tSirRSNie rsnIE; // RSN IE to be sent in
// Beacon and Probe
// Response frames
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index a2c42d6..4766533 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -360,10 +360,9 @@
#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 300
#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 301
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 302
-#define WNI_CFG_OXYGEN_NETWORK_DATA 303
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304
-#define WNI_CFG_ANTENNA_DIVESITY 305
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 303
+#define WNI_CFG_ANTENNA_DIVESITY 304
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 305
/*
* String parameter lengths
@@ -2539,14 +2538,6 @@
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX 1
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF 1
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMIN 0
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMAX 8192
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STADEF 8192
-
-#define WNI_CFG_OXYGEN_NETWORK_DATA_APMIN 0
-#define WNI_CFG_OXYGEN_NETWORK_DATA_APMAX 8192
-#define WNI_CFG_OXYGEN_NETWORK_DATA_APDEF 8192
-
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMIN 0
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMAX 9
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STADEF 0
@@ -2571,10 +2562,10 @@
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_APMAX 50
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_APDEF 10
-#define CFG_PARAM_MAX_NUM 307
-#define CFG_AP_IBUF_MAX_SIZE 246
+#define CFG_PARAM_MAX_NUM 306
+#define CFG_AP_IBUF_MAX_SIZE 245
#define CFG_AP_SBUF_MAX_SIZE 3422
-#define CFG_STA_IBUF_MAX_SIZE 241
+#define CFG_STA_IBUF_MAX_SIZE 240
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index e8f4311..93a7b50 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -354,10 +354,9 @@
#define WNI_CFG_TDLS_PUAPSD_INACT_TIME 300
#define WNI_CFG_TDLS_RX_FRAME_THRESHOLD 301
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN 302
-#define WNI_CFG_OXYGEN_NETWORK_DATA 303
-#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 304
-#define WNI_CFG_ANTENNA_DIVESITY 305
-#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 306
+#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR 303
+#define WNI_CFG_ANTENNA_DIVESITY 304
+#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT 305
/*
* String parameter lengths
@@ -1652,10 +1651,6 @@
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STAMAX 1
#define WNI_CFG_ENABLE_ADAPT_RX_DRAIN_STADEF 1
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMIN 0
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STAMAX 8192
-#define WNI_CFG_OXYGEN_NETWORK_DATA_STADEF 8192
-
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMIN 0
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STAMAX 9
#define WNI_CFG_FLEX_CONNECT_POWER_FACTOR_STADEF 0
@@ -1668,8 +1663,8 @@
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STAMAX 50
#define WNI_CFG_GO_LINK_MONITOR_TIMEOUT_STADEF 10
-#define CFG_PARAM_MAX_NUM 307
-#define CFG_STA_IBUF_MAX_SIZE 241
+#define CFG_PARAM_MAX_NUM 306
+#define CFG_STA_IBUF_MAX_SIZE 240
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index b1de498..17cea99 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -4571,17 +4571,6 @@
HAL
0 1 1
*
-* Oxygen network data (prop IE for IBSS)
-*
-WNI_CFG_OXYGEN_NETWORK_DATA I 2 0
-V RW NP
-SCH
-0 0x2000 0x2000
-V RW NP
-SCH
-0 0x2000 0x2000
-
-*
* FlexConnect Power Factor
* Default is set to 0 (disable)
*
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h
index 023a482..198b259 100644
--- a/CORE/MAC/src/include/dot11f.h
+++ b/CORE/MAC/src/include/dot11f.h
@@ -4198,31 +4198,6 @@
#ifdef __cplusplus
}; /* End extern "C". */
#endif /* C++ */
-// EID 221 (0xdd) {OUI 0x00, 0x16, 0x32}
-typedef struct sDot11fIEOxygenNetwork {
- tANI_U8 present;
- tANI_U16 data;
-} tDot11fIEOxygenNetwork;
-
-#define DOT11F_EID_OXYGENNETWORK ( 221 )
-
-// N.B. These #defines do *not* include the EID & length
-#define DOT11F_IE_OXYGENNETWORK_MIN_LEN ( 5 )
-
-#define DOT11F_IE_OXYGENNETWORK_MAX_LEN ( 5 )
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* C++ */
-tANI_U32 dot11fUnpackIeOxygenNetwork(tpAniSirGlobal, tANI_U8*,tANI_U8, tDot11fIEOxygenNetwork*);
-
-tANI_U32 dot11fPackIeOxygenNetwork(tpAniSirGlobal, tDot11fIEOxygenNetwork*, tANI_U8*, tANI_U32, tANI_U32*);
-
-tANI_U32 dot11fGetPackedIEOxygenNetwork(tpAniSirGlobal, tDot11fIEOxygenNetwork*, tANI_U32*);
-
-#ifdef __cplusplus
-}; /* End extern "C". */
-#endif /* C++ */
// EID 221 (0xdd) {OUI 0x50, 0x6f, 0x9a, 0x09} (Multi-IE)
typedef struct sDot11fIEP2PAssocReq {
tANI_U8 present;
@@ -6346,7 +6321,6 @@
tDot11fIEExtCap ExtCap;
tDot11fIEOperatingMode OperatingMode;
tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn;
- tDot11fIEOxygenNetwork OxygenNetwork;
} tDot11fBeacon;
#define DOT11F_BEACON ( 8 )
@@ -6420,7 +6394,6 @@
tDot11fIEExtCap ExtCap;
tDot11fIEOperatingMode OperatingMode;
tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn;
- tDot11fIEOxygenNetwork OxygenNetwork;
} tDot11fBeacon2;
#define DOT11F_BEACON2 ( 10 )
@@ -6482,7 +6455,6 @@
tDot11fIEExtCap ExtCap;
tDot11fIEOperatingMode OperatingMode;
tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn;
- tDot11fIEOxygenNetwork OxygenNetwork;
} tDot11fBeaconIEs;
#define DOT11F_BEACONIES ( 11 )
@@ -7077,7 +7049,6 @@
tDot11fIEVHTOperation VHTOperation;
tDot11fIEVHTExtBssLoad VHTExtBssLoad;
tDot11fIEExtCap ExtCap;
- tDot11fIEOxygenNetwork OxygenNetwork;
} tDot11fProbeResponse;
#define DOT11F_PROBERESPONSE ( 36 )
diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h
index d991ae0..04774e3 100644
--- a/CORE/MAC/src/pe/include/limSession.h
+++ b/CORE/MAC/src/pe/include/limSession.h
@@ -353,7 +353,6 @@
#endif
tANI_BOOLEAN fWaitForProbeRsp;
tANI_BOOLEAN fIgnoreCapsChange;
- tANI_U8 oxygenNwkIniFeatureEnabled;
tANI_BOOLEAN fDeauthReceived;
#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM
tANI_S8 rssi;
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 14f967a..b9fdd0a 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -646,9 +646,6 @@
psessionEntry->txLdpcIniFeatureEnabled =
pSmeStartBssReq->txLdpcIniFeatureEnabled;
- psessionEntry->oxygenNwkIniFeatureEnabled =
- pSmeStartBssReq->oxygenNwkIniFeatureEnabled;
-
vos_mem_copy((void*)&psessionEntry->rateSet,
(void*)&pSmeStartBssReq->operationalRateSet,
sizeof(tSirMacRateSet));
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 35d83dd..440ea01 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -644,18 +644,6 @@
}
#endif
- if (psessionEntry->oxygenNwkIniFeatureEnabled &&
- (eLIM_STA_IN_IBSS_ROLE == psessionEntry->limSystemRole)) {
- if (wlan_cfgGetInt(pMac, WNI_CFG_OXYGEN_NETWORK_DATA,
- &tmp) != eSIR_SUCCESS){
- limLog(pMac, LOGW, FL("Unable to get WNI_CFG_OXYGEN_NETWORK_DATA"));
- }
- else {
- pFrm->OxygenNetwork.present = 1;
- pFrm->OxygenNetwork.data = (tmp & 0xffff);
- }
- }
-
if ( psessionEntry->pLimStartBssReq )
{
PopulateDot11fWPA( pMac, &( psessionEntry->pLimStartBssReq->rsnIE ),
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.c b/CORE/MAC/src/pe/lim/limSerDesUtils.c
index 6b7bd295..a7ec961 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.c
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c
@@ -674,12 +674,6 @@
if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
return eSIR_FAILURE;
- // Extract oxygenNwkIniFeatureEnabled
- pStartBssReq->oxygenNwkIniFeatureEnabled = *pBuf++;
- len--;
- if (limCheckRemainingLength(pMac, len) == eSIR_FAILURE)
- return eSIR_FAILURE;
-
// Extract rsnIe
pStartBssReq->rsnIE.length = limGetU16(pBuf);
pBuf += sizeof(tANI_U16);
diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c
index 938a10b..56db3e9 100644
--- a/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -363,19 +363,6 @@
}
#endif
- if (psessionEntry->oxygenNwkIniFeatureEnabled &&
- (eLIM_STA_IN_IBSS_ROLE == psessionEntry->limSystemRole)) {
- if ((status = wlan_cfgGetInt(pMac, WNI_CFG_OXYGEN_NETWORK_DATA,
- &tmp)) != eSIR_SUCCESS)
- {
- limLog(pMac, LOGW, FL("Unable to get WNI_CFG_OXYGEN_NETWORK_DATA"));
- }
- else {
- pBcn2->OxygenNetwork.present = 1;
- pBcn2->OxygenNetwork.data = (tmp & 0xffff);
- }
- }
-
PopulateDot11fExtSuppRates( pMac, POPULATE_DOT11F_RATES_OPERATIONAL,
&pBcn2->ExtSuppRates, psessionEntry );
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index f58b26a..2d8edf0 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1102,7 +1102,6 @@
tANI_U8 enableTxLdpc;
- tANI_BOOLEAN enableOxygenNwk;
}tCsrConfigParam;
//Tush
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 1d3f7c0..da606a2 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -653,7 +653,6 @@
tANI_BOOLEAN enableVhtFor24GHz;
#endif
tANI_U8 txLdpcEnable;
- tANI_BOOLEAN enableOxygenNwk;
/*
* Enable/Disable heartbeat offload
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 2894bb2..9c7f6b4 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1565,7 +1565,6 @@
pMac->roam.configParam.enableVhtFor24GHz = pParam->enableVhtFor24GHz;
#endif
pMac->roam.configParam.txLdpcEnable = pParam->enableTxLdpc;
- pMac->roam.configParam.enableOxygenNwk = pParam->enableOxygenNwk;
}
return status;
@@ -1687,7 +1686,6 @@
#endif
pParam->enableTxLdpc = pMac->roam.configParam.txLdpcEnable;
- pParam->enableOxygenNwk = pMac->roam.configParam.enableOxygenNwk;
csrSetChannels(pMac, pParam);
@@ -13081,10 +13079,6 @@
*pBuf = (tANI_U8)(tANI_U8)pMac->roam.configParam.txLdpcEnable;
pBuf++;
- // prop IE enabled in .ini file
- *pBuf = (tANI_U8)pMac->roam.configParam.enableOxygenNwk;
- pBuf++;
-
// set RSN IE
if( pParam->nRSNIELength > sizeof(pMsg->rsnIE.rsnIEdata) )
{
diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c
index 49e9d94..04e651e 100644
--- a/CORE/SYS/legacy/src/utils/src/dot11f.c
+++ b/CORE/SYS/legacy/src/utils/src/dot11f.c
@@ -3886,20 +3886,6 @@
#define SigIeOperatingMode ( 0x004c )
-tANI_U32 dot11fUnpackIeOxygenNetwork(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEOxygenNetwork *pDst)
-{
- tANI_U32 status = DOT11F_PARSE_SUCCESS;
- (void) pBuf; (void)ielen; /* Shutup the compiler */
- if (pDst->present) status = DOT11F_DUPLICATE_IE;
- pDst->present = 1;
- framesntohs(pCtx, &pDst->data, pBuf, 0);
- (void)pCtx;
- return status;
-} /* End dot11fUnpackIeOxygenNetwork. */
-
-#define SigIeOxygenNetwork ( 0x004d )
-
-
static const tTLVDefn TLVS_P2PAssocReq[ ] = {
{offsetof(tDot11fIEP2PAssocReq, P2PCapability), offsetof(tDot11fTLVP2PCapability, present), "P2PCapability", SigTlvP2PCapability, DOT11F_TLV_P2PCAPABILITY, 0, 5, 5, 1, 1, 2, 0, },
{offsetof(tDot11fIEP2PAssocReq, ExtendedListenTiming), offsetof(tDot11fTLVExtendedListenTiming, present), "ExtendedListenTiming", SigTlvExtendedListenTiming, DOT11F_TLV_EXTENDEDLISTENTIMING, 0, 7, 7, 0, 1, 2, 0, },
@@ -3916,7 +3902,7 @@
return status;
} /* End dot11fUnpackIeP2PAssocReq. */
-#define SigIeP2PAssocReq ( 0x004e )
+#define SigIeP2PAssocReq ( 0x004d )
static const tTLVDefn TLVS_P2PAssocRes[ ] = {
@@ -3934,7 +3920,7 @@
return status;
} /* End dot11fUnpackIeP2PAssocRes. */
-#define SigIeP2PAssocRes ( 0x004f )
+#define SigIeP2PAssocRes ( 0x004e )
static const tTLVDefn TLVS_P2PBeacon[ ] = {
@@ -3953,7 +3939,7 @@
return status;
} /* End dot11fUnpackIeP2PBeacon. */
-#define SigIeP2PBeacon ( 0x0050 )
+#define SigIeP2PBeacon ( 0x004f )
static const tTLVDefn TLVS_P2PBeaconProbeRes[ ] = {
@@ -3975,7 +3961,7 @@
return status;
} /* End dot11fUnpackIeP2PBeaconProbeRes. */
-#define SigIeP2PBeaconProbeRes ( 0x0051 )
+#define SigIeP2PBeaconProbeRes ( 0x0050 )
static const tTLVDefn TLVS_P2PDeAuth[ ] = {
@@ -3992,7 +3978,7 @@
return status;
} /* End dot11fUnpackIeP2PDeAuth. */
-#define SigIeP2PDeAuth ( 0x0052 )
+#define SigIeP2PDeAuth ( 0x0051 )
static const tTLVDefn TLVS_P2PDeviceDiscoverabilityReq[ ] = {
@@ -4010,7 +3996,7 @@
return status;
} /* End dot11fUnpackIeP2PDeviceDiscoverabilityReq. */
-#define SigIeP2PDeviceDiscoverabilityReq ( 0x0053 )
+#define SigIeP2PDeviceDiscoverabilityReq ( 0x0052 )
static const tTLVDefn TLVS_P2PDeviceDiscoverabilityRes[ ] = {
@@ -4027,7 +4013,7 @@
return status;
} /* End dot11fUnpackIeP2PDeviceDiscoverabilityRes. */
-#define SigIeP2PDeviceDiscoverabilityRes ( 0x0054 )
+#define SigIeP2PDeviceDiscoverabilityRes ( 0x0053 )
static const tTLVDefn TLVS_P2PDisAssoc[ ] = {
@@ -4044,7 +4030,7 @@
return status;
} /* End dot11fUnpackIeP2PDisAssoc. */
-#define SigIeP2PDisAssoc ( 0x0055 )
+#define SigIeP2PDisAssoc ( 0x0054 )
static const tTLVDefn TLVS_P2PGONegCnf[ ] = {
@@ -4065,7 +4051,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegCnf. */
-#define SigIeP2PGONegCnf ( 0x0056 )
+#define SigIeP2PGONegCnf ( 0x0055 )
static const tTLVDefn TLVS_P2PGONegReq[ ] = {
@@ -4090,7 +4076,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegReq. */
-#define SigIeP2PGONegReq ( 0x0057 )
+#define SigIeP2PGONegReq ( 0x0056 )
static const tTLVDefn TLVS_P2PGONegRes[ ] = {
@@ -4115,7 +4101,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegRes. */
-#define SigIeP2PGONegRes ( 0x0058 )
+#define SigIeP2PGONegRes ( 0x0057 )
static const tTLVDefn TLVS_P2PGONegWPS[ ] = {
@@ -4133,7 +4119,7 @@
return status;
} /* End dot11fUnpackIeP2PGONegWPS. */
-#define SigIeP2PGONegWPS ( 0x0059 )
+#define SigIeP2PGONegWPS ( 0x0058 )
tANI_U32 dot11fUnpackIeP2PIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEP2PIEOpaque *pDst)
@@ -4153,7 +4139,7 @@
return status;
} /* End dot11fUnpackIeP2PIEOpaque. */
-#define SigIeP2PIEOpaque ( 0x005a )
+#define SigIeP2PIEOpaque ( 0x0059 )
static const tTLVDefn TLVS_P2PInvitationReq[ ] = {
@@ -4176,7 +4162,7 @@
return status;
} /* End dot11fUnpackIeP2PInvitationReq. */
-#define SigIeP2PInvitationReq ( 0x005b )
+#define SigIeP2PInvitationReq ( 0x005a )
static const tTLVDefn TLVS_P2PInvitationRes[ ] = {
@@ -4197,7 +4183,7 @@
return status;
} /* End dot11fUnpackIeP2PInvitationRes. */
-#define SigIeP2PInvitationRes ( 0x005c )
+#define SigIeP2PInvitationRes ( 0x005b )
static const tTLVDefn TLVS_P2PNoticeOfAbsence[ ] = {
@@ -4214,7 +4200,7 @@
return status;
} /* End dot11fUnpackIeP2PNoticeOfAbsence. */
-#define SigIeP2PNoticeOfAbsence ( 0x005d )
+#define SigIeP2PNoticeOfAbsence ( 0x005c )
static const tTLVDefn TLVS_P2PPresenceResponse[ ] = {
@@ -4232,7 +4218,7 @@
return status;
} /* End dot11fUnpackIeP2PPresenceResponse. */
-#define SigIeP2PPresenceResponse ( 0x005e )
+#define SigIeP2PPresenceResponse ( 0x005d )
static const tTLVDefn TLVS_P2PProbeReq[ ] = {
@@ -4253,7 +4239,7 @@
return status;
} /* End dot11fUnpackIeP2PProbeReq. */
-#define SigIeP2PProbeReq ( 0x005f )
+#define SigIeP2PProbeReq ( 0x005e )
static const tTLVDefn TLVS_P2PProbeRes[ ] = {
@@ -4274,7 +4260,7 @@
return status;
} /* End dot11fUnpackIeP2PProbeRes. */
-#define SigIeP2PProbeRes ( 0x0060 )
+#define SigIeP2PProbeRes ( 0x005f )
static const tTLVDefn TLVS_P2PProvisionDiscoveryReq[ ] = {
@@ -4293,7 +4279,7 @@
return status;
} /* End dot11fUnpackIeP2PProvisionDiscoveryReq. */
-#define SigIeP2PProvisionDiscoveryReq ( 0x0061 )
+#define SigIeP2PProvisionDiscoveryReq ( 0x0060 )
static const tTLVDefn TLVS_P2PWSCProvisionDiscoveryRes[ ] = {
@@ -4310,7 +4296,7 @@
return status;
} /* End dot11fUnpackIeP2PWSCProvisionDiscoveryRes. */
-#define SigIeP2PWSCProvisionDiscoveryRes ( 0x0062 )
+#define SigIeP2PWSCProvisionDiscoveryRes ( 0x0061 )
tANI_U32 dot11fUnpackIePTIControl(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPTIControl *pDst)
@@ -4327,7 +4313,7 @@
return status;
} /* End dot11fUnpackIePTIControl. */
-#define SigIePTIControl ( 0x0063 )
+#define SigIePTIControl ( 0x0062 )
tANI_U32 dot11fUnpackIePUBufferStatus(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPUBufferStatus *pDst)
@@ -4347,7 +4333,7 @@
return status;
} /* End dot11fUnpackIePUBufferStatus. */
-#define SigIePUBufferStatus ( 0x0064 )
+#define SigIePUBufferStatus ( 0x0063 )
tANI_U32 dot11fUnpackIePowerCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerCaps *pDst)
@@ -4364,7 +4350,7 @@
return status;
} /* End dot11fUnpackIePowerCaps. */
-#define SigIePowerCaps ( 0x0065 )
+#define SigIePowerCaps ( 0x0064 )
tANI_U32 dot11fUnpackIePowerConstraints(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEPowerConstraints *pDst)
@@ -4378,7 +4364,7 @@
return status;
} /* End dot11fUnpackIePowerConstraints. */
-#define SigIePowerConstraints ( 0x0066 )
+#define SigIePowerConstraints ( 0x0065 )
tANI_U32 dot11fUnpackIeQBSSLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQBSSLoad *pDst)
@@ -4398,7 +4384,7 @@
return status;
} /* End dot11fUnpackIeQBSSLoad. */
-#define SigIeQBSSLoad ( 0x0067 )
+#define SigIeQBSSLoad ( 0x0066 )
tANI_U32 dot11fUnpackIeQOSCapsAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsAp *pDst)
@@ -4418,7 +4404,7 @@
return status;
} /* End dot11fUnpackIeQOSCapsAp. */
-#define SigIeQOSCapsAp ( 0x0068 )
+#define SigIeQOSCapsAp ( 0x0067 )
tANI_U32 dot11fUnpackIeQOSCapsStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQOSCapsStation *pDst)
@@ -4440,7 +4426,7 @@
return status;
} /* End dot11fUnpackIeQOSCapsStation. */
-#define SigIeQOSCapsStation ( 0x0069 )
+#define SigIeQOSCapsStation ( 0x0068 )
tANI_U32 dot11fUnpackIeQuiet(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEQuiet *pDst)
@@ -4463,7 +4449,7 @@
return status;
} /* End dot11fUnpackIeQuiet. */
-#define SigIeQuiet ( 0x006a )
+#define SigIeQuiet ( 0x0069 )
tANI_U32 dot11fUnpackIeRCPIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERCPIIE *pDst)
@@ -4477,7 +4463,7 @@
return status;
} /* End dot11fUnpackIeRCPIIE. */
-#define SigIeRCPIIE ( 0x006b )
+#define SigIeRCPIIE ( 0x006a )
static const tFFDefn FFS_RICDataDesc[ ] = {
@@ -4517,7 +4503,7 @@
return status;
} /* End dot11fUnpackIeRICDataDesc. */
-#define SigIeRICDataDesc ( 0x006c )
+#define SigIeRICDataDesc ( 0x006b )
tANI_U32 dot11fUnpackIeRSN(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSN *pDst)
@@ -4620,7 +4606,7 @@
return status;
} /* End dot11fUnpackIeRSN. */
-#define SigIeRSN ( 0x006d )
+#define SigIeRSN ( 0x006c )
tANI_U32 dot11fUnpackIeRSNIIE(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNIIE *pDst)
@@ -4634,7 +4620,7 @@
return status;
} /* End dot11fUnpackIeRSNIIE. */
-#define SigIeRSNIIE ( 0x006e )
+#define SigIeRSNIIE ( 0x006d )
tANI_U32 dot11fUnpackIeRSNOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIERSNOpaque *pDst)
@@ -4654,7 +4640,7 @@
return status;
} /* End dot11fUnpackIeRSNOpaque. */
-#define SigIeRSNOpaque ( 0x006f )
+#define SigIeRSNOpaque ( 0x006e )
tANI_U32 dot11fUnpackIeSuppChannels(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppChannels *pDst)
@@ -4674,7 +4660,7 @@
return status;
} /* End dot11fUnpackIeSuppChannels. */
-#define SigIeSuppChannels ( 0x0070 )
+#define SigIeSuppChannels ( 0x006f )
tANI_U32 dot11fUnpackIeSuppRates(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIESuppRates *pDst)
@@ -4702,7 +4688,7 @@
return status;
} /* End dot11fUnpackIeSuppRates. */
-#define SigIeSuppRates ( 0x0071 )
+#define SigIeSuppRates ( 0x0070 )
tANI_U32 dot11fUnpackIeTIM(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETIM *pDst)
@@ -4731,7 +4717,7 @@
return status;
} /* End dot11fUnpackIeTIM. */
-#define SigIeTIM ( 0x0072 )
+#define SigIeTIM ( 0x0071 )
tANI_U32 dot11fUnpackIeTPCReport(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCReport *pDst)
@@ -4748,7 +4734,7 @@
return status;
} /* End dot11fUnpackIeTPCReport. */
-#define SigIeTPCReport ( 0x0073 )
+#define SigIeTPCReport ( 0x0072 )
tANI_U32 dot11fUnpackIeTPCRequest(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIETPCRequest *pDst)
@@ -4761,7 +4747,7 @@
return status;
} /* End dot11fUnpackIeTPCRequest. */
-#define SigIeTPCRequest ( 0x0074 )
+#define SigIeTPCRequest ( 0x0073 )
tANI_U32 dot11fUnpackIeVHTCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTCaps *pDst)
@@ -4814,7 +4800,7 @@
return status;
} /* End dot11fUnpackIeVHTCaps. */
-#define SigIeVHTCaps ( 0x0075 )
+#define SigIeVHTCaps ( 0x0074 )
tANI_U32 dot11fUnpackIeVHTExtBssLoad(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTExtBssLoad *pDst)
@@ -4840,7 +4826,7 @@
return status;
} /* End dot11fUnpackIeVHTExtBssLoad. */
-#define SigIeVHTExtBssLoad ( 0x0076 )
+#define SigIeVHTExtBssLoad ( 0x0075 )
tANI_U32 dot11fUnpackIeVHTOperation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEVHTOperation *pDst)
@@ -4863,7 +4849,7 @@
return status;
} /* End dot11fUnpackIeVHTOperation. */
-#define SigIeVHTOperation ( 0x0077 )
+#define SigIeVHTOperation ( 0x0076 )
tANI_U32 dot11fUnpackIeWAPI(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPI *pDst)
@@ -4932,7 +4918,7 @@
return status;
} /* End dot11fUnpackIeWAPI. */
-#define SigIeWAPI ( 0x0078 )
+#define SigIeWAPI ( 0x0077 )
tANI_U32 dot11fUnpackIeWAPIOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWAPIOpaque *pDst)
@@ -4952,7 +4938,7 @@
return status;
} /* End dot11fUnpackIeWAPIOpaque. */
-#define SigIeWAPIOpaque ( 0x0079 )
+#define SigIeWAPIOpaque ( 0x0078 )
tANI_U32 dot11fUnpackIeWFATPC(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFATPC *pDst)
@@ -4969,7 +4955,7 @@
return status;
} /* End dot11fUnpackIeWFATPC. */
-#define SigIeWFATPC ( 0x007a )
+#define SigIeWFATPC ( 0x0079 )
tANI_U32 dot11fUnpackIeWFDIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWFDIEOpaque *pDst)
@@ -4989,7 +4975,7 @@
return status;
} /* End dot11fUnpackIeWFDIEOpaque. */
-#define SigIeWFDIEOpaque ( 0x007b )
+#define SigIeWFDIEOpaque ( 0x007a )
tANI_U32 dot11fUnpackIeWMMCaps(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMCaps *pDst)
@@ -5017,7 +5003,7 @@
return status;
} /* End dot11fUnpackIeWMMCaps. */
-#define SigIeWMMCaps ( 0x007c )
+#define SigIeWMMCaps ( 0x007b )
tANI_U32 dot11fUnpackIeWMMInfoAp(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoAp *pDst)
@@ -5038,7 +5024,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoAp. */
-#define SigIeWMMInfoAp ( 0x007d )
+#define SigIeWMMInfoAp ( 0x007c )
tANI_U32 dot11fUnpackIeWMMInfoStation(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMInfoStation *pDst)
@@ -5063,7 +5049,7 @@
return status;
} /* End dot11fUnpackIeWMMInfoStation. */
-#define SigIeWMMInfoStation ( 0x007e )
+#define SigIeWMMInfoStation ( 0x007d )
tANI_U32 dot11fUnpackIeWMMParams(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWMMParams *pDst)
@@ -5156,7 +5142,7 @@
return status;
} /* End dot11fUnpackIeWMMParams. */
-#define SigIeWMMParams ( 0x007f )
+#define SigIeWMMParams ( 0x007e )
tANI_U32 dot11fUnpackIeWPA(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPA *pDst)
@@ -5238,7 +5224,7 @@
return status;
} /* End dot11fUnpackIeWPA. */
-#define SigIeWPA ( 0x0080 )
+#define SigIeWPA ( 0x007f )
tANI_U32 dot11fUnpackIeWPAOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWPAOpaque *pDst)
@@ -5258,7 +5244,7 @@
return status;
} /* End dot11fUnpackIeWPAOpaque. */
-#define SigIeWPAOpaque ( 0x0081 )
+#define SigIeWPAOpaque ( 0x0080 )
static const tTLVDefn TLVS_WSC[ ] = {
@@ -5296,7 +5282,7 @@
return status;
} /* End dot11fUnpackIeWSC. */
-#define SigIeWSC ( 0x0082 )
+#define SigIeWSC ( 0x0081 )
tANI_U32 dot11fUnpackIeWiderBWChanSwitchAnn(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWiderBWChanSwitchAnn *pDst)
@@ -5316,7 +5302,7 @@
return status;
} /* End dot11fUnpackIeWiderBWChanSwitchAnn. */
-#define SigIeWiderBWChanSwitchAnn ( 0x0083 )
+#define SigIeWiderBWChanSwitchAnn ( 0x0082 )
static const tTLVDefn TLVS_WscAssocReq[ ] = {
@@ -5335,7 +5321,7 @@
return status;
} /* End dot11fUnpackIeWscAssocReq. */
-#define SigIeWscAssocReq ( 0x0084 )
+#define SigIeWscAssocReq ( 0x0083 )
static const tTLVDefn TLVS_WscAssocRes[ ] = {
@@ -5354,7 +5340,7 @@
return status;
} /* End dot11fUnpackIeWscAssocRes. */
-#define SigIeWscAssocRes ( 0x0085 )
+#define SigIeWscAssocRes ( 0x0084 )
static const tTLVDefn TLVS_WscBeacon[ ] = {
@@ -5379,7 +5365,7 @@
return status;
} /* End dot11fUnpackIeWscBeacon. */
-#define SigIeWscBeacon ( 0x0086 )
+#define SigIeWscBeacon ( 0x0085 )
static const tTLVDefn TLVS_WscBeaconProbeRes[ ] = {
@@ -5412,7 +5398,7 @@
return status;
} /* End dot11fUnpackIeWscBeaconProbeRes. */
-#define SigIeWscBeaconProbeRes ( 0x0087 )
+#define SigIeWscBeaconProbeRes ( 0x0086 )
tANI_U32 dot11fUnpackIeWscIEOpaque(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U8 ielen, tDot11fIEWscIEOpaque *pDst)
@@ -5432,7 +5418,7 @@
return status;
} /* End dot11fUnpackIeWscIEOpaque. */
-#define SigIeWscIEOpaque ( 0x0088 )
+#define SigIeWscIEOpaque ( 0x0087 )
static const tTLVDefn TLVS_WscProbeReq[ ] = {
@@ -5463,7 +5449,7 @@
return status;
} /* End dot11fUnpackIeWscProbeReq. */
-#define SigIeWscProbeReq ( 0x0089 )
+#define SigIeWscProbeReq ( 0x0088 )
static const tTLVDefn TLVS_WscProbeRes[ ] = {
@@ -5496,7 +5482,7 @@
return status;
} /* End dot11fUnpackIeWscProbeRes. */
-#define SigIeWscProbeRes ( 0x008a )
+#define SigIeWscProbeRes ( 0x0089 )
static const tTLVDefn TLVS_WscReassocRes[ ] = {
@@ -5515,7 +5501,7 @@
return status;
} /* End dot11fUnpackIeWscReassocRes. */
-#define SigIeWscReassocRes ( 0x008b )
+#define SigIeWscReassocRes ( 0x008a )
static const tFFDefn FFS_AddBAReq[] = {
@@ -8427,7 +8413,6 @@
{offsetof(tDot11fBeacon, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, 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, OxygenNetwork), offsetof(tDot11fIEOxygenNetwork, present), 0, "OxygenNetwork" , 0, 7, 7, SigIeOxygenNetwork, {0, 22, 50, 0, 0}, 3, DOT11F_EID_OXYGENNETWORK, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackBeacon(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fBeacon *pFrm)
@@ -9512,15 +9497,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -9656,7 +9632,6 @@
{offsetof(tDot11fBeacon2, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, 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, OxygenNetwork), offsetof(tDot11fIEOxygenNetwork, present), 0, "OxygenNetwork" , 0, 7, 7, SigIeOxygenNetwork, {0, 22, 50, 0, 0}, 3, DOT11F_EID_OXYGENNETWORK, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackBeacon2(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fBeacon2 *pFrm)
@@ -10589,15 +10564,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -10653,7 +10619,6 @@
{offsetof(tDot11fBeaconIEs, ExtCap), offsetof(tDot11fIEExtCap, present), 0, "ExtCap" , 0, 10, 10, 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, OxygenNetwork), offsetof(tDot11fIEOxygenNetwork, present), 0, "OxygenNetwork" , 0, 7, 7, SigIeOxygenNetwork, {0, 22, 50, 0, 0}, 3, DOT11F_EID_OXYGENNETWORK, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackBeaconIEs(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fBeaconIEs *pFrm)
@@ -11846,15 +11811,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -14128,7 +14084,6 @@
{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, OxygenNetwork), offsetof(tDot11fIEOxygenNetwork, present), 0, "OxygenNetwork" , 0, 7, 7, SigIeOxygenNetwork, {0, 22, 50, 0, 0}, 3, DOT11F_EID_OXYGENNETWORK, 0, },
{0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, };
tANI_U32 dot11fUnpackProbeResponse(tpAniSirGlobal pCtx, tANI_U8 *pBuf, tANI_U32 nBuf, tDot11fProbeResponse *pFrm)
@@ -15267,15 +15222,6 @@
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("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
}
# endif // DOT11F_DUMP_FRAMES
return status;
@@ -20435,9 +20381,6 @@
case SigIeOperatingMode:
status |= dot11fUnpackIeOperatingMode(pCtx, pBufRemaining, len, ( tDot11fIEOperatingMode* )(pFrm + pIe->offset + sizeof(tDot11fIEOperatingMode)*countOffset) );
break;
- case SigIeOxygenNetwork:
- status |= dot11fUnpackIeOxygenNetwork(pCtx, pBufRemaining, len, ( tDot11fIEOxygenNetwork* )(pFrm + pIe->offset + sizeof(tDot11fIEOxygenNetwork)*countOffset) );
- break;
case SigIeP2PAssocReq:
status |= dot11fUnpackIeP2PAssocReq(pCtx, pBufRemaining, len, ( tDot11fIEP2PAssocReq* )(pFrm + pIe->offset + sizeof(tDot11fIEP2PAssocReq)*countOffset) );
break;
@@ -22619,11 +22562,6 @@
byteCount = 1;
pIePresent = ( (tDot11fIEOperatingMode* )(pFrm + pIe->offset + offset * i ))->present;
break;
- case SigIeOxygenNetwork:
- offset = sizeof(tDot11fIEOxygenNetwork);
- byteCount = 2;
- pIePresent = ( (tDot11fIEOxygenNetwork* )(pFrm + pIe->offset + offset * i ))->present;
- break;
case SigIeP2PAssocReq:
offset = sizeof(tDot11fIEP2PAssocReq);
status |= dot11fGetPackedIEP2PAssocReq(pCtx, ( tDot11fIEP2PAssocReq* )(pFrm + pIe->offset + offset * i ), pnNeeded);
@@ -28499,42 +28437,6 @@
return DOT11F_PARSE_SUCCESS;
} /* End dot11fPackIeOperatingMode. */
-tANI_U32 dot11fPackIeOxygenNetwork(tpAniSirGlobal pCtx,
- tDot11fIEOxygenNetwork *pSrc,
- tANI_U8 *pBuf,
- tANI_U32 nBuf,
- tANI_U32 *pnConsumed)
-{
- tANI_U8* pIeLen = 0;
- tANI_U32 nConsumedOnEntry = *pnConsumed;
- tANI_U32 nNeeded = 0U;
- nNeeded += 2;
- while ( pSrc->present )
- {
- if ( nNeeded > nBuf ) return DOT11F_BUFFER_OVERFLOW;
- *pBuf = 221;
- ++pBuf; ++(*pnConsumed);
- pIeLen = pBuf;
- ++pBuf; ++(*pnConsumed);
- *pBuf = 0x0;
- ++pBuf; ++(*pnConsumed);
- *pBuf = 0x16;
- ++pBuf; ++(*pnConsumed);
- *pBuf = 0x32;
- ++pBuf; ++(*pnConsumed);
- frameshtons(pCtx, pBuf, pSrc->data, 0);
- *pnConsumed += 2;
- // fieldsEndFlag = 1
- break;
- }
- (void)pCtx;
- if (pIeLen)
- {
- *pIeLen = *pnConsumed - nConsumedOnEntry - 2;
- }
- return DOT11F_PARSE_SUCCESS;
-} /* End dot11fPackIeOxygenNetwork. */
-
tANI_U32 dot11fPackIeP2PAssocReq(tpAniSirGlobal pCtx,
tDot11fIEP2PAssocReq *pSrc,
tANI_U8 *pBuf,
@@ -35008,15 +34910,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON), pBuf, nBuf);
}
@@ -36033,15 +35926,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACON2), pBuf, nBuf);
}
@@ -37239,15 +37123,6 @@
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq0, 1);
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->WiderBWChanSwitchAnn.newCenterChanFreq1, 1);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_BEACONIES), pBuf, nBuf);
}
@@ -40342,15 +40217,6 @@
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("reserved7 (1): %d\n"), pFrm->ExtCap.reserved7);
}
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("OxygenNetwork:\n"));
- if (!pFrm->OxygenNetwork.present)
- {
- FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("Not present.\n"));
- }
- else
- {
- FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), ( tANI_U8* )&pFrm->OxygenNetwork.data, 2);
- }
FRAMES_LOG0(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), FRFL("to:\n"));
FRAMES_DUMP(pCtx, FRAMES_SEV_FOR_FRAME(pCtx, DOT11F_PROBERESPONSE), pBuf, nBuf);
}
@@ -45108,9 +44974,6 @@
case SigIeOperatingMode:
status |= dot11fPackIeOperatingMode(pCtx, ( tDot11fIEOperatingMode* )(pSrc + pIe->offset + sizeof(tDot11fIEOperatingMode) * i ), pBufRemaining, nBufRemaining, &len);
break;
- case SigIeOxygenNetwork:
- status |= dot11fPackIeOxygenNetwork(pCtx, ( tDot11fIEOxygenNetwork* )(pSrc + pIe->offset + sizeof(tDot11fIEOxygenNetwork) * i ), pBufRemaining, nBufRemaining, &len);
- break;
case SigIeP2PAssocReq:
status |= dot11fPackIeP2PAssocReq(pCtx, ( tDot11fIEP2PAssocReq* )(pSrc + pIe->offset + sizeof(tDot11fIEP2PAssocReq) * i ), pBufRemaining, nBufRemaining, &len);
break;
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index d52ab2c..14de0da 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ
diff --git a/firmware_bin/WCNSS_qcom_cfg.ini b/firmware_bin/WCNSS_qcom_cfg.ini
index 640f7de..32bc9b7 100644
--- a/firmware_bin/WCNSS_qcom_cfg.ini
+++ b/firmware_bin/WCNSS_qcom_cfg.ini
@@ -415,9 +415,6 @@
#Scan offload
gEnableDirectedScanOffload=0
-# Oxygen network (prop IE for IBSS)
-gEnableOxygenNwk=0
-
#FlexConnect Power Factor
#Default is set to 0 (disable)
gFlexConnectPowerFactor=0