prima: WLAN Driver Release 3.2.0.9
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index cebffee..3f08943 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -100,6 +100,10 @@
#define LIM_MLM_REMOVEKEY_REQ LIM_MLM_MSG_START + 39
#define LIM_MLM_REMOVEKEY_CNF LIM_MLM_MSG_START + 40
+#ifdef FEATURE_OEM_DATA_SUPPORT
+#define LIM_MLM_OEM_DATA_REQ LIM_MLM_MSG_START + 41
+#define LIM_MLM_OEM_DATA_CNF LIM_MLM_MSG_START + 42
+#endif
#define LIM_HASH_ADD 0
#define LIM_HASH_UPDATE 1
@@ -174,7 +178,7 @@
tANI_U8 dtimPeriod;
tSirMacCfParamSet cfParamSet;
tSirMacChanNum channelNumber;
- tAniCBSecondaryMode cbMode;
+ ePhyChanBondState cbMode;
tANI_U16 atimWindow;
tSirMacRateSet rateSet;
tANI_U8 sessionId; //Added For BT-AMP Support
@@ -244,8 +248,6 @@
tSirRSNie rsnIE;
tSirAddie addIE; // additional IE recevied from the peer, which possibly includes WSC IE and/or P2P IE.
tSirMacCapabilityInfo capabilityInfo;
- tAniTitanHtCapabilityInfo titanHtCaps;
-
tAniBool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
@@ -300,8 +302,6 @@
tSirRSNie rsnIE;
tSirAddie addIE; // additional IE recevied from the peer, which can be WSC IE and/or P2P IE.
tSirMacCapabilityInfo capabilityInfo;
- tAniTitanHtCapabilityInfo titanHtCaps;
-
tAniBool spectrumMgtIndicator;
tSirMacPowerCapInfo powerCap;
tSirSupChnl supportedChannels;
@@ -647,11 +647,8 @@
void limGetRandomBssid(tpAniSirGlobal pMac ,tANI_U8 *data);
-// Function to handle CB CFG parameter updates
-void handleCBCFGChange( tpAniSirGlobal pMac, tANI_U32 cfgId );
-
// Function to handle HT and HT IE CFG parameter intializations
-void handleHTCapabilityandHTInfo(struct sAniSirGlobal *pMac);
+void handleHTCapabilityandHTInfo(struct sAniSirGlobal *pMac, tpPESession psessionEntry);
// Function to handle CFG parameter updates
void limHandleCFGparamUpdate(tpAniSirGlobal, tANI_U32);
@@ -675,7 +672,6 @@
// Function to cleanup LMM state machine
void limCleanupLmm(tpAniSirGlobal);
-
// Management frame handling functions
void limProcessBeaconFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
void limProcessBeaconFrameNoSession(tpAniSirGlobal, tANI_U8 *);
@@ -734,8 +730,8 @@
void limContinueChannelScan(tpAniSirGlobal);
tSirResultCodes limMlmAddBss(tpAniSirGlobal, tLimMlmStartReq *,tpPESession psessionEntry);
-#if (WNI_POLARIS_FW_PACKAGE == ADVANCED) && defined(ANI_PRODUCT_TYPE_AP)
-tSirRetStatus limSendChannelSwitchMgmtFrame(tpAniSirGlobal, tSirMacAddr, tANI_U8, tANI_U8, tANI_U8);
+#if 1 //(WNI_POLARIS_FW_PACKAGE == ADVANCED) && defined(ANI_PRODUCT_TYPE_AP)
+tSirRetStatus limSendChannelSwitchMgmtFrame(tpAniSirGlobal, tSirMacAddr, tANI_U8, tANI_U8, tANI_U8, tpPESession);
#endif
#if defined WLAN_FEATURE_VOWIFI
@@ -789,11 +785,15 @@
void limSetScanMode(tpAniSirGlobal pMac);
/// Function that Switches the Channel and sets the CB Mode
-void limSetChannel(tpAniSirGlobal pMac, tANI_U32 titanHtcap, tANI_U8 channel, tPowerdBm maxTxPower, tANI_U8 peSessionId);
+void limSetChannel(tpAniSirGlobal pMac, tANI_U8 channel, tANI_U8 secChannelOffset, tPowerdBm maxTxPower, tANI_U8 peSessionId);
/// Function that completes channel scan
void limCompleteMlmScan(tpAniSirGlobal, tSirResultCodes);
+#ifdef FEATURE_OEM_DATA_SUPPORT
+/// Funtion that sets system into meas mode for oem data req
+void limSetOemDataReqMode(tpAniSirGlobal pMac, eHalStatus status, tANI_U32* data);
+#endif
#ifdef ANI_SUPPORT_11H
/// Function that sends Measurement Report action frame
@@ -811,11 +811,6 @@
void limProcessMlmAddStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQt,tpPESession psessionEntry);
void limProcessMlmDelStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
void limProcessMlmDelBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPESession);
-#ifdef ANI_PRODUCT_TYPE_AP
-void limProcessApMlmAddStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
-void limProcessApMlmDelStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
-void limProcessApMlmDelBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
-#endif
void limProcessStaMlmAddStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ ,tpPESession psessionEntry);
void limProcessStaMlmDelStaRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,tpPESession psessionEntry);
void limProcessStaMlmDelBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ ,tpPESession psessionEntry);
@@ -1077,7 +1072,7 @@
void limSendSmeMgmtFrameInd(
tpAniSirGlobal pMac, tANI_U8 frameType,
tANI_U8 *frame, tANI_U32 frameLen, tANI_U16 sessionId,
- tANI_U32 rxChan);
+ tANI_U32 rxChan, tpPESession psessionEntry);
void limProcessRemainOnChnTimeout(tpAniSirGlobal pMac);
void limSendP2PActionFrame(tpAniSirGlobal pMac, tpSirMsgQ pMsg);
void limAbortRemainOnChan(tpAniSirGlobal pMac);