wlan: mac: remove obsolete "WLAN_FEATURE_P2P" featurization
The current driver has evolved over time from a driver that originally
only supported "station" mode. When the initial support for "P2P"
mode was added, the code was added with conditional compilation so
that the "P2P" feature could be included or excluded based upon
the target needs. Now, however, there is an expectation that all
drivers will support both "station" mode and "P2P" mode.
Therefore remove the conditional compilation since "P2P" mode code
must always be present.
Change-Id: Ib0ab3bfcf517fa3308d76ce7ee43ecdcd6b9e343
CRs-fixed: 459417
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index f2e5dcb..222de83 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -103,9 +103,7 @@
#include "ccxApi.h"
#include "ccxGlobal.h"
#endif
-#ifdef WLAN_FEATURE_P2P
#include "p2p_Api.h"
-#endif
#if defined WLAN_FEATURE_VOWIFI_11R
#include <limFTDefs.h>
@@ -145,14 +143,12 @@
/* max number of legacy bssid we can store during scan on one channel */
#define MAX_NUM_LEGACY_BSSID_PER_CHANNEL 10
-#if defined WLAN_FEATURE_P2P
#define P2P_WILDCARD_SSID "DIRECT-" //TODO Put it in proper place;
#define P2P_WILDCARD_SSID_LEN 7
#ifdef WLAN_FEATURE_CONCURRENT_P2P
#define MAX_NO_OF_P2P_SESSIONS 5
#endif //WLAN_FEATURE_CONCURRENT_P2P
-#endif //WLAN_FEATURE_P2P
#define SPACE_ASCII_VALUE 32
@@ -247,9 +243,7 @@
#ifdef FEATURE_WLAN_CCX
TX_TIMER gLimCcxTsmTimer;
#endif
-#ifdef WLAN_FEATURE_P2P
TX_TIMER gLimRemainOnChannelTimer;
-#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
TX_TIMER gLimTdlsDisRspWaitTimer;
TX_TIMER gLimTdlsLinkSetupRspTimeouTimer;
@@ -259,10 +253,8 @@
TX_TIMER gLimPeriodicJoinProbeReqTimer;
TX_TIMER gLimDisassocAckTimer;
TX_TIMER gLimDeauthAckTimer;
-#ifdef WLAN_FEATURE_P2P
// This timer is started when single shot NOA insert msg is sent to FW for scan in P2P GO mode
TX_TIMER gLimP2pSingleShotNoaInsertTimer;
-#endif
//********************TIMER SECTION ENDS**************************************************
// ALL THE FIELDS BELOW THIS CAN BE ZEROED OUT in limInitialize
//****************************************************************************************
@@ -320,9 +312,7 @@
tANI_U32 gLimCurrentScanChannelId;
// Hold onto SCAN criteria
-#ifdef WLAN_FEATURE_P2P
tSirSmeScanReq *gpLimSmeScanReq; // this one is used in P2P GO case when scan needs to be actually done a few BIs later after publishing NOA
-#endif
tLimMlmScanReq *gpLimMlmScanReq;
/// This indicates total length of 'matched' scan results
@@ -363,11 +353,9 @@
tANI_U32 gLimTriggerBackgroundScanDuringQuietBss;
-#ifdef WLAN_FEATURE_P2P
// This variable store the total duration to do scan
tANI_U32 gTotalScanDuration;
tANI_U32 p2pRemOnChanTimeStamp;
-#endif
// abort scan is used to abort an on-going scan
tANI_U8 abortScan;
@@ -893,10 +881,8 @@
tLimMlmOemDataRsp *gpLimMlmOemDataRsp;
#endif
-#ifdef WLAN_FEATURE_P2P
tSirRemainOnChnReq *gpLimRemainOnChanReq; //hold remain on chan request in this buf
vos_list_t gLimMgmtFrameRegistratinQueue;
-#endif
tANI_U32 mgmtFrameSessionId;
tSirBackgroundScanMode gLimBackgroundScanMode;
@@ -907,7 +893,6 @@
tLimDisassocDeauthCnfReq limDisassocDeauthCnfReq;
} tAniSirLim, *tpAniSirLim;
-#ifdef WLAN_FEATURE_P2P
typedef struct sLimMgmtFrameRegistration
{
vos_list_node_t node; // MUST be first element
@@ -916,7 +901,6 @@
tANI_U16 sessionId;
tANI_U8 matchData[1];
} tLimMgmtFrameRegistration, *tpLimMgmtFrameRegistration;
-#endif
#if defined WLAN_FEATURE_VOWIFI
typedef struct sRrmContext
@@ -1038,13 +1022,11 @@
#if defined WLAN_FEATURE_VOWIFI
tRrmContext rrm;
#endif
-#ifdef WLAN_FEATURE_P2P
#ifdef WLAN_FEATURE_CONCURRENT_P2P
tp2pContext p2pContext[MAX_NO_OF_P2P_SESSIONS];
#else
tp2pContext p2pContext;
#endif
-#endif
#if defined WLAN_FEATURE_VOWIFI_11R
tftContext ft;
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 79fdbd6..ec04653 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -331,9 +331,7 @@
eSIR_SME_FT_REASSOC_TIMEOUT_FAILURE,
eSIR_SME_FT_REASSOC_FAILURE,
#endif
-#ifdef WLAN_FEATURE_P2P
eSIR_SME_SEND_ACTION_FAIL,
-#endif
#ifdef WLAN_FEATURE_PACKET_FILTERING
eSIR_SME_PC_FILTER_MATCH_COUNT_REQ_FAILED,
#endif // WLAN_FEATURE_PACKET_FILTERING
@@ -440,7 +438,6 @@
} tBeaconForwarding;
-#ifdef WLAN_FEATURE_P2P
typedef struct sSirRemainOnChnReq
{
tANI_U16 messageType;
@@ -463,7 +460,6 @@
tANI_U16 matchLen;
tANI_U8 matchData[1];
}tSirRegisterMgmtFrame, *tpSirRegisterMgmtFrame;
-#endif
//
// Identifies the neighbor BSS' that was(were) detected
@@ -848,9 +844,7 @@
/* This MUST be the last field of the structure */
-#ifdef WLAN_FEATURE_P2P
tANI_BOOLEAN p2pSearch;
-#endif
tANI_U16 uIEFieldLen;
tANI_U16 uIEFieldOffset;
@@ -2281,7 +2275,6 @@
}tSirRSSINotification, *tpSirRSSINotification;
-#ifdef WLAN_FEATURE_P2P
typedef struct sSirP2PNoaStart
{
@@ -2325,7 +2318,6 @@
tANI_U32 uNoa2Interval;
tANI_U32 uNoa2StartTime;
} tSirP2PNoaAttr, *tpSirP2PNoaAttr;
-#endif
typedef __ani_attr_pre_packed struct sSirTclasInfo
{
@@ -3338,7 +3330,6 @@
tANI_U32 coexIndData[SIR_COEX_IND_DATA_SIZE];
}tSirSmeCoexInd, *tpSirSmeCoexInd;
-#ifdef WLAN_FEATURE_P2P
typedef struct sSirSmeMgmtFrameInd
{
tANI_U16 mesgType;
@@ -3349,7 +3340,6 @@
tANI_S8 rxRssi;
tANI_U8 frameBuf[1]; //variable
}tSirSmeMgmtFrameInd, *tpSirSmeMgmtFrameInd;
-#endif
#define SIR_IS_FULL_POWER_REASON_DISCONNECTED(eReason) \
( ( eSME_LINK_DISCONNECTED_BY_HDD == (eReason) ) || \
@@ -3359,7 +3349,6 @@
( ( eSME_LINK_DISCONNECTED_BY_HDD == (eReason) ) || ( eSME_FULL_PWR_NEEDED_BY_HDD == (eReason) ) )
/* P2P Power Save Related */
-#ifdef WLAN_FEATURE_P2P
typedef struct sSirNoAParam
{
tANI_U8 ctWindow:7;
@@ -3370,7 +3359,6 @@
tANI_U32 singleNoADuration;
tANI_U8 psSelection;
}tSirNoAParam, *tpSirNoAParam;
-#endif
typedef struct sSirWlanSuspendParam
{
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index c875ab0..b2b562a 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -255,11 +255,9 @@
#define SIR_MAC_BLKACK_ADD_REQ 0
#define SIR_MAC_BLKACK_ADD_RSP 1
#define SIR_MAC_BLKACK_DEL 2
-#if defined WLAN_FEATURE_P2P
#define SIR_MAC_ACTION_VENDOR_SPECIFIC 9
#define SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY 0x7F
#define SIR_MAC_ACTION_P2P_SUBTYPE_PRESENCE_RSP 2
-#endif
#ifdef WLAN_FEATURE_11W
//11w SA query request/response action frame category code
@@ -449,14 +447,12 @@
#define SIR_MAC_WSM_OUI SIR_MAC_WME_OUI
#define SIR_MAC_WSC_OUI "\x00\x50\xf2\x04"
#define SIR_MAC_WSC_OUI_SIZE 4
-#ifdef WLAN_FEATURE_P2P
#define SIR_MAC_P2P_OUI "\x50\x6f\x9a\x09"
#define SIR_MAC_P2P_OUI_SIZE 4
#define SIR_P2P_NOA_ATTR 12
#define SIR_MAX_NOA_ATTR_LEN 31
#define SIR_MAX_NOA_DESCR 2
#define SIR_P2P_IE_HEADER_LEN 6
-#endif
// min size of wme oui header: oui(3) + type + subtype + version
#define SIR_MAC_OUI_WME_HDR_MIN 6
@@ -2207,7 +2203,6 @@
tANI_U8 actionID;
} __ani_attr_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr;
-#if defined WLAN_FEATURE_P2P
typedef __ani_attr_pre_packed struct sSirMacVendorSpecificPublicActionFrameHdr
{
tANI_U8 category;
@@ -2226,7 +2221,6 @@
} __ani_attr_packed tSirMacP2PActionFrameHdr, *tpSirMacP2PActionFrameHdr;
-#endif
typedef struct sSirMacMeasActionFrameHdr
{
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index b0ff29c..ad8d8dd 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -233,7 +233,6 @@
eWNI_SME_UPPER_LAYER_ASSOC_CNF,
eWNI_SME_HIDE_SSID_REQ,
eWNI_SME_CHNG_MCC_BEACON_INTERVAL,
-#ifdef WLAN_FEATURE_P2P
eWNI_SME_REMAIN_ON_CHANNEL_REQ,
eWNI_SME_REMAIN_ON_CHN_IND,
eWNI_SME_REMAIN_ON_CHN_RSP,
@@ -243,7 +242,6 @@
eWNI_SME_ACTION_FRAME_SEND_CNF,
eWNI_SME_ABORT_REMAIN_ON_CHAN_IND,
eWNI_SME_UPDATE_NOA,
-#endif
eWNI_SME_PRE_CHANNEL_SWITCH_FULL_POWER,
//General Power Save Messages
eWNI_PMC_MSG_TYPES_BEGIN,
@@ -309,9 +307,7 @@
eWNI_SME_CCX_ADJACENT_AP_REPORT,
#endif
-#ifdef WLAN_FEATURE_P2P
eWNI_SME_REGISTER_MGMT_FRAME_REQ,
-#endif
eWNI_SME_COEX_IND,
diff --git a/CORE/MAC/src/cfg/cfgApi.c b/CORE/MAC/src/cfg/cfgApi.c
index 717cc36..6a93c97 100644
--- a/CORE/MAC/src/cfg/cfgApi.c
+++ b/CORE/MAC/src/cfg/cfgApi.c
@@ -874,13 +874,11 @@
else if ( (systemRole == eLIM_AP_ROLE) ||(systemRole == eLIM_BT_AMP_AP_ROLE)||(systemRole == eLIM_BT_AMP_STA_ROLE) ||
(systemRole == eLIM_STA_ROLE) )
pCapInfo->ess = 1; // ESS bit
-#if defined WLAN_FEATURE_P2P
else if (limGetSystemRole(sessionEntry) == eLIM_P2P_DEVICE_ROLE )
{
pCapInfo->ess = 0;
pCapInfo->ibss = 0;
}
-#endif
else
cfgLog(pMac, LOGP, FL("can't get capability, role is UNKNOWN!!\n"));
diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h
index 3015d0b..10d5383 100644
--- a/CORE/MAC/src/include/parserApi.h
+++ b/CORE/MAC/src/include/parserApi.h
@@ -107,9 +107,7 @@
tDot11fIEQuiet quietIE;
tDot11fIEHTCaps HTCaps;
tDot11fIEHTInfo HTInfo;
-#ifdef WLAN_FEATURE_P2P
tDot11fIEP2PProbeRes P2PProbeRes;
-#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
tANI_U8 mdie[SIR_MDIE_SIZE];
#endif
@@ -799,11 +797,9 @@
tDot11fIEWscAssocRes *pDot11f,
tpSirAssocReq pRcvdAssocReq);
-#ifdef WLAN_FEATURE_P2P
tSirRetStatus PopulateDot11AssocResP2PIE(tpAniSirGlobal pMac,
tDot11fIEP2PAssocRes *pDot11f,
tpSirAssocReq pRcvdAssocReq);
-#endif
tSirRetStatus PopulateDot11fWscInAssocRes(tpAniSirGlobal pMac,
tDot11fIEWscAssocRes *pDot11f);
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 98aadd3..9295eaf 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -163,7 +163,6 @@
tANI_U32 data[1];
} tSirMbMsg, *tpSirMbMsg;
-#ifdef WLAN_FEATURE_P2P
/// Mailbox Message Structure for P2P
typedef struct sSirMbMsgP2p
{
@@ -188,7 +187,6 @@
*/
tANI_U32 data[1];
} tSirMbMsgP2p, *tpSirMbMsgP2p;
-#endif
/// Message queue definitions
// msgtype(2bytes) reserved(2bytes) bodyptr(4bytes) bodyval(4bytes)
@@ -492,12 +490,10 @@
#define SIR_HAL_AGGR_QOS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 160)
#endif /* WLAN_FEATURE_VOWIFI_11R */
-#ifdef WLAN_FEATURE_P2P
/* P2P <-> HAL P2P msg */
#define SIR_HAL_SET_P2P_GO_NOA_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 161)
#define SIR_HAL_P2P_NOA_ATTR_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 162)
#define SIR_HAL_P2P_NOA_START_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 163)
-#endif
#define SIR_HAL_SET_LINK_STATE_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 165)
@@ -641,10 +637,8 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
#define SIR_LIM_FT_PREAUTH_RSP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1E)
#endif
-#ifdef WLAN_FEATURE_P2P
#define SIR_LIM_REMAIN_CHN_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1F)
#define SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x20)
-#endif
#ifdef WMM_APSD
#define SIR_LIM_WMM_APSD_SP_START_MSG_TYPE (SIR_LIM_TIMEOUT_MSG_START + 0x21)
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index b51017b..4a608f5 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -112,12 +112,10 @@
eLIM_STA_IN_IBSS_ROLE,
eLIM_STA_ROLE,
eLIM_BT_AMP_STA_ROLE,
- eLIM_BT_AMP_AP_ROLE
-#ifdef WLAN_FEATURE_P2P
- ,eLIM_P2P_DEVICE_ROLE
- ,eLIM_P2P_DEVICE_GO
- ,eLIM_P2P_DEVICE_CLINET
-#endif
+ eLIM_BT_AMP_AP_ROLE,
+ eLIM_P2P_DEVICE_ROLE,
+ eLIM_P2P_DEVICE_GO,
+ eLIM_P2P_DEVICE_CLINET
} tLimSystemRole;
/**
@@ -203,9 +201,7 @@
eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE,
eLIM_MLM_WT_FT_REASSOC_RSP_STATE,
#endif
-#ifdef WLAN_FEATURE_P2P
eLIM_MLM_P2P_LISTEN_STATE,
-#endif
} tLimMlmStates;
// 11h channel quiet states
@@ -311,9 +307,7 @@
/* Number of SSIDs to scan(send Probe request) */
tANI_U8 numSsid;
-#ifdef WLAN_FEATURE_P2P
tANI_BOOLEAN p2pSearch;
-#endif
tANI_U16 uIEFieldLen;
tANI_U16 uIEFieldOffset;
diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h
index d07c0cb..4384c1c 100644
--- a/CORE/MAC/src/pe/include/limSession.h
+++ b/CORE/MAC/src/pe/include/limSession.h
@@ -289,12 +289,10 @@
#ifdef FEATURE_WLAN_LFR
tAniBool isFastRoamIniFeatureEnabled;
#endif
-#ifdef WLAN_FEATURE_P2P
tSirNoAParam p2pNoA;
tSirP2PNoaAttr p2pGoPsUpdate;
tANI_U32 defaultAuthFailureTimeout;
tSirP2PNoaStart p2pGoPsNoaStartInd;
-#endif
/* EDCA QoS parameters
* gLimEdcaParams - These EDCA parameters are used locally on AP or STA.
diff --git a/CORE/MAC/src/pe/include/schGlobal.h b/CORE/MAC/src/pe/include/schGlobal.h
index 8adc850..e50fa49 100644
--- a/CORE/MAC/src/pe/include/schGlobal.h
+++ b/CORE/MAC/src/pe/include/schGlobal.h
@@ -152,9 +152,7 @@
/// flag to indicate that beacon template has been updated
tANI_U8 fBeaconChanged;
-#if defined(WLAN_FEATURE_P2P)
tANI_U16 p2pIeOffset;
-#endif
};
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 5007828..cc9bf9b 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -114,9 +114,7 @@
pMac->lim.gLimCurrentScanChannelId = 0;
pMac->lim.gpLimMlmScanReq = NULL;
-#ifdef WLAN_FEATURE_P2P
pMac->lim.gpLimSmeScanReq = NULL;
-#endif
pMac->lim.gLimMlmScanResultLength = 0;
pMac->lim.gLimSmeScanResultLength = 0;
@@ -721,9 +719,7 @@
limFTOpen(pMac);
#endif
-#ifdef WLAN_FEATURE_P2P
vos_list_init(&pMac->lim.gLimMgmtFrameRegistratinQueue);
-#endif
#if 0
@@ -802,7 +798,6 @@
VOS_STATUS retStatus;
#endif
-#ifdef WLAN_FEATURE_P2P
//Before destroying the list making sure all the nodes have been deleted.
//Which should be the normal case, but a memory leak has been reported.
@@ -818,7 +813,6 @@
}
vos_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue);
-#endif
limCleanupMlm(pMac);
limCleanupLmm(pMac);
@@ -892,13 +886,11 @@
pMac->lim.gpLimMlmRemoveKeyReq = NULL;
}
-#ifdef WLAN_FEATURE_P2P
if (pMac->lim.gpLimSmeScanReq != NULL)
{
palFreeMemory(pMac->hHdd, pMac->lim.gpLimSmeScanReq);
pMac->lim.gpLimSmeScanReq = NULL;
}
-#endif
if (pMac->lim.gpLimMlmScanReq != NULL)
{
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 21ee5e3..00dfb3c 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -2097,10 +2097,8 @@
tSirRetStatus retCode = eSIR_SUCCESS;
tSirMacAddr staMac, *pStaAddr;
tANI_U8 i;
-#ifdef WLAN_FEATURE_P2P
tpSirAssocReq pAssocReq;
tANI_U8 *p2pIe = NULL;
-#endif
#if 0
retCode = wlan_cfgGetStr(pMac, WNI_CFG_STA_ID, staMac, &cfg);
if (retCode != eSIR_SUCCESS)
@@ -2250,14 +2248,12 @@
if (psessionEntry->parsedAssocReq != NULL)
{
-#ifdef WLAN_FEATURE_P2P
// Get a copy of the already parsed Assoc Request
pAssocReq = (tpSirAssocReq) psessionEntry->parsedAssocReq[pStaDs->assocId];
if ( pAssocReq && pAssocReq->addIEPresent && pAssocReq->addIE.length ) {
p2pIe = limGetP2pIEPtr(pMac, pAssocReq->addIE.addIEdata, pAssocReq->addIE.length);
}
pAddStaParams->p2pCapableSta = (p2pIe != NULL);
-#endif
}
//Disable BA. It will be set as part of ADDBA negotiation.
@@ -2614,12 +2610,10 @@
limLog(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL\n"));
pAddStaParams->listenInterval = (tANI_U16)listenInterval;
-#ifdef WLAN_FEATURE_P2P
if (VOS_P2P_CLIENT_MODE == psessionEntry->pePersona)
{
pAddStaParams->p2pCapableSta = 1;
}
-#endif
limFillSupportedRatesInfo(pMac, NULL, &pAddStaParams->supportedRates,psessionEntry);
@@ -2847,13 +2841,11 @@
{
tSirMacSSid currentSSID;
tLimMlmJoinCnf mlmJoinCnf;
-#ifdef WLAN_FEATURE_P2P
tANI_U32 val = 0;
tANI_U32 *noa1DurationFromBcn = NULL;
tANI_U32 *noa2DurationFromBcn = NULL;
tANI_U32 noa;
tANI_U32 TotalNum_NoADesc = 0;
-#endif
palCopyMemory( pMac->hHdd, currentSSID.ssId,
psessionEntry->ssId.ssId,
@@ -2891,7 +2883,6 @@
// Deactivate Periodic Join timer
limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
-#ifdef WLAN_FEATURE_P2P
if (VOS_P2P_CLIENT_MODE == psessionEntry->pePersona &&
pBPR->P2PProbeRes.NoticeOfAbsence.present)
{
@@ -2925,7 +2916,6 @@
{
psessionEntry->defaultAuthFailureTimeout = 0;
}
-#endif
// Update Beacon Interval at CFG database
@@ -3346,12 +3336,10 @@
pAddBssParams->halPersona = (tANI_U8)psessionEntry->pePersona; //update persona
-#ifdef WLAN_FEATURE_P2P
if (VOS_P2P_CLIENT_MODE == psessionEntry->pePersona)
{
pAddBssParams->staContext.p2pCapableSta = 1;
}
-#endif
pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled ||
limIsconnectedOnDFSChannel(bssDescription->channelId);
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index 638ca96..ec2c483 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -70,7 +70,6 @@
===========================================================================*/
-#ifdef WLAN_FEATURE_P2P
#include "limUtils.h"
#include "limSessionUtils.h"
#include "wlan_qct_wda.h"
@@ -1099,5 +1098,4 @@
return eSIR_SUCCESS;
} /*** end __limProcessSmeGoNegReq() ***/
-#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index b22c6a0..e50d5e6 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -1992,7 +1992,6 @@
}
break;
#endif
-#if defined WLAN_FEATURE_P2P
case SIR_MAC_ACTION_PUBLIC_USAGE:
switch(pActionHdr->actionID) {
case SIR_MAC_ACTION_VENDOR_SPECIFIC:
@@ -2050,7 +2049,6 @@
break;
}
break;
-#endif
#ifdef WLAN_FEATURE_11W
case SIR_MAC_ACTION_SA_QUERY:
@@ -2082,7 +2080,6 @@
}
}
-#if defined WLAN_FEATURE_P2P
/**
* limProcessActionFrameNoSession
*
@@ -2151,4 +2148,3 @@
}
}
-#endif
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index a77bdba..1ba03cb 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -211,14 +211,12 @@
//PELOG3(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG3, (tANI_U8*)pBd, ((tpHalBufDesc) pBd)->mpduDataOffset + frameLen);)
-#ifdef WLAN_FEATURE_P2P
//Restore default failure timeout
if (VOS_P2P_CLIENT_MODE == psessionEntry->pePersona && psessionEntry->defaultAuthFailureTimeout)
{
ccmCfgSetInt(pMac,WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT ,
psessionEntry->defaultAuthFailureTimeout, NULL, eANI_BOOLEAN_FALSE);
}
-#endif
/// Determine if WEP bit is set in the FC or received MAC header
if (pHdr->fc.wep)
diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index c5cbef9..80afee3 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -147,11 +147,9 @@
if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) ||
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE))
{
-#ifdef WLAN_FEATURE_P2P
//If we are scanning for P2P, only accept probe rsp
if((pMac->lim.gLimHalScanState != eLIM_HAL_SCANNING_STATE) || (NULL == pMac->lim.gpLimMlmScanReq)
|| !pMac->lim.gpLimMlmScanReq->p2pSearch )
-#endif
{
limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
((pMac->lim.gLimHalScanState == eLIM_HAL_SCANNING_STATE) ? eANI_BOOLEAN_TRUE : eANI_BOOLEAN_FALSE),
@@ -273,11 +271,9 @@
if ( (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) ||
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) )
{
-#ifdef WLAN_FEATURE_P2P
//If we are scanning for P2P, only accept probe rsp
if((pMac->lim.gLimHalScanState != eLIM_HAL_SCANNING_STATE) || (NULL == pMac->lim.gpLimMlmScanReq)
|| !pMac->lim.gpLimMlmScanReq->p2pSearch )
-#endif
{
limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 80e23ef..e6d4374 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -92,10 +92,8 @@
#include "vos_memory.h"
#endif
-#ifdef WLAN_FEATURE_P2P
/* In P2P GO case, we want to call scan on NOA start indication from limProcessMessages */
extern void __limProcessSmeScanReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf);
-#endif
void limLogSessionStates(tpAniSirGlobal pMac);
@@ -156,9 +154,7 @@
(limMsg->type != WDA_WOWL_ENTER_RSP) &&
(limMsg->type != WDA_WOWL_EXIT_RSP) &&
(limMsg->type != WDA_SWITCH_CHANNEL_RSP) &&
-#ifdef WLAN_FEATURE_P2P
(limMsg->type != WDA_P2P_NOA_ATTR_IND) &&
-#endif
#ifdef FEATURE_OEM_DATA_SUPPORT
(limMsg->type != WDA_START_OEM_DATA_RSP) &&
#endif
@@ -374,12 +370,10 @@
{
limProcessProbeReqFrame_multiple_BSS(pMac, pRxPacketInfo, psessionEntry);
}
-#if defined WLAN_FEATURE_P2P
else if ((fc.type == SIR_MAC_MGMT_FRAME) && (fc.subType == SIR_MAC_MGMT_ACTION))
{
limProcessActionFrameNoSession( pMac, pRxPacketInfo);
}
-#endif
else
{
*deferMsg = true;
@@ -495,11 +489,9 @@
//Dinesh need one more arguement.
//limSendDisassocMgmtFrame(pMac, eSIR_MAC_CLASS3_FRAME_FROM_NON_ASSOC_STA_REASON,(tANI_U8 *) pRxPacketInfo);
//TODO: verify this
-#if defined WLAN_FEATURE_P2P
//This could be a public action frame.
if( psessionEntry->limSystemRole == eLIM_P2P_DEVICE_ROLE )
limProcessActionFrameNoSession(pMac, (tANI_U8 *) pRxPacketInfo);
-#endif
#ifdef FEATURE_WLAN_TDLS
{
@@ -551,7 +543,6 @@
return;
}
-#ifdef WLAN_FEATURE_P2P
/**
* limCheckMgmtRegisteredFrames()
*
@@ -659,7 +650,6 @@
return match;
} /*** end limCheckMgmtRegisteredFrames() ***/
-#endif /* WLAN_FEATURE_P2P */
/**
@@ -758,9 +748,7 @@
if((fc.subType != SIR_MAC_MGMT_PROBE_RSP )&&
(fc.subType != SIR_MAC_MGMT_BEACON)&&
(fc.subType != SIR_MAC_MGMT_PROBE_REQ)
-#if defined WLAN_FEATURE_P2P
&& (fc.subType != SIR_MAC_MGMT_ACTION ) //Public action frame can be received from non-associated stations.
-#endif
)
{
@@ -774,7 +762,6 @@
}
-#ifdef WLAN_FEATURE_P2P
/* Check if frame is registered by HDD */
if(limCheckMgmtRegisteredFrames(pMac, pRxPacketInfo, psessionEntry))
{
@@ -782,7 +769,6 @@
limPktFree(pMac, HAL_TXRX_FRM_802_11_MGMT, pRxPacketInfo, limMsg->bodyptr);
return;
}
-#endif
@@ -905,19 +891,15 @@
break;
case SIR_MAC_MGMT_ACTION:
-#if defined WLAN_FEATURE_P2P
if(psessionEntry == NULL)
limProcessActionFrameNoSession(pMac, pRxPacketInfo);
else
{
-#endif
if (WDA_GET_RX_UNKNOWN_UCAST(pRxPacketInfo))
limHandleUnknownA2IndexFrames(pMac, pRxPacketInfo,psessionEntry);
else
limProcessActionFrame(pMac, pRxPacketInfo,psessionEntry);
-#if defined WLAN_FEATURE_P2P
}
-#endif
break;
default:
// Received Management frame of 'reserved' subtype
@@ -1312,9 +1294,7 @@
break;
case eWNI_SME_SCAN_REQ:
-#ifdef WLAN_FEATURE_P2P
case eWNI_SME_REMAIN_ON_CHANNEL_REQ:
-#endif
case eWNI_SME_DISASSOC_REQ:
case eWNI_SME_DEAUTH_REQ:
case eWNI_SME_STA_STAT_REQ:
@@ -1394,10 +1374,8 @@
#endif
case eWNI_SME_ADD_STA_SELF_REQ:
case eWNI_SME_DEL_STA_SELF_REQ:
-#ifdef WLAN_FEATURE_P2P
case eWNI_SME_REGISTER_MGMT_FRAME_REQ:
case eWNI_SME_UPDATE_NOA:
-#endif
// These messages are from HDD
limProcessNormalHddMsg(pMac, limMsg, false); //no need to response to hdd
break;
@@ -1425,7 +1403,6 @@
}
}
break;
-#if defined WLAN_FEATURE_P2P
case eWNI_SME_SEND_ACTION_FRAME_IND:
limSendP2PActionFrame(pMac, limMsg);
palFreeMemory(pMac->hHdd, (tANI_U8 *)limMsg->bodyptr);
@@ -1516,7 +1493,6 @@
break;
-#endif
/* eWNI_SME_PRE_CHANNEL_SWITCH_FULL_POWER Message comes after the
* device comes out of full power for the full power request sent
* because of channel switch with switch count as 0, so call the same
@@ -1617,10 +1593,8 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT:
#endif
-#ifdef WLAN_FEATURE_P2P
case SIR_LIM_REMAIN_CHN_TIMEOUT:
case SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT:
-#endif
case SIR_LIM_DISASSOC_ACK_TIMEOUT:
case SIR_LIM_DEAUTH_ACK_TIMEOUT:
// These timeout messages are handled by MLM sub module
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 42a55f7..3cd0020 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -166,11 +166,9 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT:limProcessFTPreauthRspTimeout(pMac); break;
#endif
-#ifdef WLAN_FEATURE_P2P
case SIR_LIM_REMAIN_CHN_TIMEOUT: limProcessRemainOnChnTimeout(pMac); break;
case SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT:
limProcessInsertSingleShotNOATimeout(pMac); break;
-#endif
case SIR_LIM_DISASSOC_ACK_TIMEOUT: limProcessDisassocAckTimeout(pMac); break;
case SIR_LIM_DEAUTH_ACK_TIMEOUT: limProcessDeauthAckTimeout(pMac); break;
case LIM_MLM_ADDBA_REQ: limProcessMlmAddBAReq( pMac, Msg->bodyptr ); break;
@@ -644,14 +642,12 @@
}
}
-#ifdef WLAN_FEATURE_P2P
else if( (eLIM_AP_ROLE == pMac->lim.gpSession[i].limSystemRole )
&& ( VOS_P2P_GO_MODE == pMac->lim.gpSession[i].pePersona )
)
{
pInitScanParam->useNoA = TRUE;
}
-#endif
}
}
if (pInitScanParam->scanEntry.activeBSScnt)
@@ -770,12 +766,10 @@
}
}
__limCreateInitScanRawFrame(pMac, pInitScanParam);
-#ifdef WLAN_FEATURE_P2P
if (pInitScanParam->useNoA)
{
pInitScanParam->scanDuration = pMac->lim.gTotalScanDuration;
}
-#endif
/* Inform HAL whether it should check for traffic on the link
* prior to performing a background scan
*/
@@ -1451,12 +1445,10 @@
pSta->greenFieldCapable, pSta->txChannelWidthSet, pSta->mimoPS, pSta->lsigTxopProtection,
pSta->fDsssCckMode40Mhz,pSta->fShortGI20Mhz, pSta->fShortGI40Mhz);
-#ifdef WLAN_FEATURE_P2P
if (VOS_P2P_GO_MODE == psessionEntry->pePersona)
{
pSta->p2pCapableSta = 1;
}
-#endif
//Disable BA. It will be set as part of ADDBA negotiation.
for( i = 0; i < STACFG_MAX_TC; i++ )
@@ -1770,12 +1762,10 @@
(pMac->lim.gpSession[i].limSystemRole == eLIM_BT_AMP_AP_ROLE)||
(pMac->lim.gpSession[i].limSystemRole == eLIM_BT_AMP_STA_ROLE) )&&
(pMac->lim.gpSession[i].limMlmState == eLIM_MLM_BSS_STARTED_STATE) )
-#ifdef WLAN_FEATURE_P2P
|| ( ( ( (pMac->lim.gpSession[i].bssType == eSIR_INFRA_AP_MODE)
&& ( pMac->lim.gpSession[i].pePersona == VOS_P2P_GO_MODE) )
|| (pMac->lim.gpSession[i].limSystemRole == eLIM_AP_ROLE) )
&& (pMac->lim.gpSession[i].limMlmState == eLIM_MLM_BSS_STARTED_STATE) )
-#endif
))
{
return FALSE;
@@ -1848,7 +1838,6 @@
pMac->lim.gLimSystemInScanLearnMode = 1;
-#ifdef WLAN_FEATURE_P2P
/* temporary fix to handle case where NOA duration calculation is incorrect
* for scanning on DFS channels */
@@ -1882,7 +1871,6 @@
/* Adding an overhead of 5ms to account for the scan messaging delays */
pMac->lim.gTotalScanDuration += 5;
-#endif
limSetScanMode(pMac);
}
else
@@ -3962,14 +3950,12 @@
* before Auth Failure timeout.
* Issue MLM auth confirm with timeout reason code
*/
-#ifdef WLAN_FEATURE_P2P
//Restore default failure timeout
if (VOS_P2P_CLIENT_MODE == psessionEntry->pePersona && psessionEntry->defaultAuthFailureTimeout)
{
ccmCfgSetInt(pMac,WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT ,
psessionEntry->defaultAuthFailureTimeout, NULL, eANI_BOOLEAN_FALSE);
}
-#endif
limRestoreFromAuthState(pMac,eSIR_SME_AUTH_TIMEOUT_RESULT_CODE,eSIR_MAC_UNSPEC_FAILURE_REASON,psessionEntry);
break;
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index e307ab7..883ea3e 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -3670,7 +3670,6 @@
goto error;
}
-#ifdef WLAN_FEATURE_P2P
if( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE )
{
// Activate Join Periodic Probe Req timer
@@ -3680,7 +3679,6 @@
goto error;
}
}
-#endif
return;
error:
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
index 010b1d0..a307503 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
@@ -438,7 +438,6 @@
if (pMac->lim.gLimProbeRespDisableFlag)
break;
-#ifdef WLAN_FEATURE_P2P
// Don't send probe response if P2P go is scanning till scan come to idle state.
if((psessionEntry->pePersona == VOS_P2P_GO_MODE) && ((pMac->lim.gpLimRemainOnChanReq )
|| (pMac->lim.gLimHalScanState != eLIM_HAL_IDLE_SCAN_STATE)))
@@ -447,7 +446,6 @@
FL("While GO is scanning, don't send probe response on diff channel\n"));
break;
}
-#endif
pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
@@ -475,7 +473,6 @@
}
else
{
-#ifdef WLAN_FEATURE_P2P
if (psessionEntry->pePersona == VOS_P2P_GO_MODE)
{
tANI_U8 i = 0, rate_11b = 0, other_rates = 0;
@@ -514,7 +511,6 @@
return;
}
}
-#endif
if ((psessionEntry->limSystemRole == eLIM_AP_ROLE))
{
@@ -596,7 +592,6 @@
probeReq.p2pIePresent);
break;
}
-#ifdef WLAN_FEATURE_P2P
else if (psessionEntry->pePersona == VOS_P2P_GO_MODE)
{
tANI_U8 direct_ssid[7] = "DIRECT-";
@@ -610,7 +605,6 @@
break;
}
}
-#endif
else
{
PELOG3(limLog(pMac, LOG3,
@@ -675,7 +669,6 @@
* @return None
*/
-#if defined WLAN_FEATURE_P2P
static void
limIndicateProbeReqToHDD(tpAniSirGlobal pMac, tANI_U8 *pBd,
tpPESession psessionEntry)
@@ -697,7 +690,6 @@
limSendP2PProbeResponse(pMac, pBd, psessionEntry);
#endif
} /*** end limIndicateProbeReqToHDD() ***/
-#endif
/**
* limProcessProbeReqFrame_multiple_BSS
@@ -726,7 +718,6 @@
if (psessionEntry != NULL)
{
-#ifdef WLAN_FEATURE_P2P
if ((eLIM_AP_ROLE == psessionEntry->limSystemRole)
#ifdef WLAN_FEATURE_P2P_INTERNAL
|| (psessionEntry->limSystemRole == eLIM_P2P_DEVICE_ROLE)
@@ -735,7 +726,6 @@
{
limIndicateProbeReqToHDD(pMac, pBd, psessionEntry);
}
-#endif
limProcessProbeReqFrame(pMac,pBd,psessionEntry);
return;
}
@@ -745,7 +735,6 @@
psessionEntry = peFindSessionBySessionId(pMac,i);
if ( (psessionEntry != NULL) )
{
-#ifdef WLAN_FEATURE_P2P
if ((eLIM_AP_ROLE == psessionEntry->limSystemRole)
#ifdef WLAN_FEATURE_P2P_INTERNAL
|| (psessionEntry->limSystemRole == eLIM_P2P_DEVICE_ROLE)
@@ -754,7 +743,6 @@
{
limIndicateProbeReqToHDD(pMac, pBd, psessionEntry);
}
-#endif
if ( (eLIM_AP_ROLE == psessionEntry->limSystemRole) ||
(eLIM_STA_IN_IBSS_ROLE == psessionEntry->limSystemRole) ||
(eLIM_BT_AMP_AP_ROLE == psessionEntry->limSystemRole) ||
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 253bd59..9019fc5 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -120,9 +120,7 @@
extern void peRegisterTLHandle(tpAniSirGlobal pMac);
#endif
-#ifdef WLAN_FEATURE_P2P
extern int limProcessRemainOnChnlReq(tpAniSirGlobal pMac, tANI_U32 *pMsg);
-#endif
#ifdef BACKGROUND_SCAN_ENABLED
@@ -178,12 +176,10 @@
(pMac->lim.gpSession[i].limSystemRole == eLIM_BT_AMP_AP_ROLE)||
(pMac->lim.gpSession[i].limSystemRole == eLIM_BT_AMP_STA_ROLE) )&&
(pMac->lim.gpSession[i].limSmeState == eLIM_SME_NORMAL_STATE) )
-#ifdef WLAN_FEATURE_P2P
|| ( ( ( (pMac->lim.gpSession[i].bssType == eSIR_INFRA_AP_MODE)
&& ( pMac->lim.gpSession[i].pePersona == VOS_P2P_GO_MODE) )
|| (pMac->lim.gpSession[i].limSystemRole == eLIM_AP_ROLE) )
&& (pMac->lim.gpSession[i].limSmeState == eLIM_SME_NORMAL_STATE) )
-#endif
))
{
validState = FALSE;
@@ -1307,9 +1303,7 @@
pMlmScanReq->minChannelTimeBtc = pScanReq->minChannelTimeBtc;
pMlmScanReq->maxChannelTimeBtc = pScanReq->maxChannelTimeBtc;
pMlmScanReq->dot11mode = pScanReq->dot11mode;
-#ifdef WLAN_FEATURE_P2P
pMlmScanReq->p2pSearch = pScanReq->p2pSearch;
-#endif
//Store the smeSessionID and transaction ID for later use.
pMac->lim.gSmeSessionId = pScanReq->sessionId;
@@ -4395,7 +4389,6 @@
} /*** end __limProcessSmeDelStaSelfReq() ***/
-#ifdef WLAN_FEATURE_P2P
/**
* __limProcessSmeRegisterMgmtFrameReq()
*
@@ -4594,7 +4587,6 @@
}
-#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
/*
@@ -4949,7 +4941,6 @@
break;
case eWNI_SME_SCAN_REQ:
-#ifdef WLAN_FEATURE_P2P
/* If we are in P2P GO mode we need to insert NOA before actually starting a scan */
if ((limIsNOAInsertReqd(pMac) == TRUE) && IS_FEATURE_SUPPORTED_BY_FW(P2P_GO_NOA_DECOUPLE_INIT_SCAN))
{
@@ -4957,11 +4948,8 @@
}
else
{
-#endif
__limProcessSmeScanReq(pMac, pMsgBuf);
-#ifdef WLAN_FEATURE_P2P
}
-#endif
break;
#ifdef FEATURE_OEM_DATA_SUPPORT
@@ -4970,7 +4958,6 @@
break;
#endif
-#ifdef WLAN_FEATURE_P2P
case eWNI_SME_REMAIN_ON_CHANNEL_REQ:
bufConsumed = limProcessRemainOnChnlReq(pMac, pMsgBuf);
break;
@@ -4978,7 +4965,6 @@
case eWNI_SME_UPDATE_NOA:
__limProcessSmeNoAUpdate(pMac, pMsgBuf);
break;
-#endif
case eWNI_SME_JOIN_REQ:
__limProcessSmeJoinReq(pMac, pMsgBuf);
@@ -5132,11 +5118,9 @@
__limProcessSmeDelStaSelfReq( pMac, pMsgBuf );
break;
-#ifdef WLAN_FEATURE_P2P
case eWNI_SME_REGISTER_MGMT_FRAME_REQ:
__limProcessSmeRegisterMgmtFrameReq( pMac, pMsgBuf );
break;
-#endif
#ifdef FEATURE_WLAN_TDLS
case eWNI_SME_TDLS_SEND_MGMT_REQ:
limProcessSmeTdlsMgmtSendReq(pMac, pMsgBuf);
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index d178be4..6913489 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -364,7 +364,6 @@
eHalStatus status;
tANI_U8 dontUpdateAll = 0;
-#ifdef WLAN_FEATURE_P2P
tSirMacAddr bssid = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
tANI_BOOLEAN fFound = FALSE;
tpSirMacDataHdr3a pHdr;
@@ -385,7 +384,6 @@
}
}
}
-#endif
/**
* Compare SSID with the one sent in
@@ -529,21 +527,8 @@
if ( ( pMac->lim.gLimReturnAfterFirstMatch & 0x01 ) ||
( pMac->lim.gLim24Band11dScanDone && ( pMac->lim.gLimReturnAfterFirstMatch & 0x40 ) ) ||
- ( pMac->lim.gLim50Band11dScanDone && ( pMac->lim.gLimReturnAfterFirstMatch & 0x80 ) )
-#ifdef WLAN_FEATURE_P2P
- || fFound
-#endif
- )
-/*
- if ((pMac->lim.gLimReturnAfterFirstMatch & 0x01) ||
- (pMac->lim.gLim24Band11dScanDone &&
- !(pMac->lim.gLimReturnAfterFirstMatch & 0xC0)) ||
- (pMac->lim.gLim50Band11dScanDone &&
- !(pMac->lim.gLimReturnAfterFirstMatch & 0xC0)) ||
- (pMac->lim.gLim24Band11dScanDone &&
- pMac->lim.gLim50Band11dScanDone &&
- pMac->lim.gLimReturnAfterFirstMatch & 0xC0))
-*/
+ ( pMac->lim.gLim50Band11dScanDone && ( pMac->lim.gLimReturnAfterFirstMatch & 0x80 ) ) ||
+ fFound )
{
/**
* Stop scanning and return the BSS description(s)
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index addf566..019efb8 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -196,9 +196,7 @@
eHalStatus halstatus;
tpPESession psessionEntry;
tANI_U8 sessionId;
-#ifdef WLAN_FEATURE_P2P
tANI_U8 *p2pIe = NULL;
-#endif
tANI_U8 txFlag = 0;
#ifndef GEN4_SCAN
@@ -230,7 +228,6 @@
// & delegating to assorted helpers:
PopulateDot11fSSID( pMac, pSsid, &pr.SSID );
-#ifdef WLAN_FEATURE_P2P
if( nAdditionalIELen && pAdditionalIE )
{
p2pIe = limGetP2pIEPtr(pMac, pAdditionalIE, nAdditionalIELen);
@@ -252,7 +249,6 @@
}
else
{
-#endif
PopulateDot11fSuppRates( pMac, nChannelNum,
&pr.SuppRates,psessionEntry);
@@ -260,9 +256,7 @@
{
PopulateDot11fExtSuppRates1( pMac, nChannelNum, &pr.ExtSuppRates );
}
-#ifdef WLAN_FEATURE_P2P
}
-#endif
#if defined WLAN_FEATURE_VOWIFI
//Table 7-14 in IEEE Std. 802.11k-2008 says
@@ -390,7 +384,6 @@
* to send it at OFDM rate.
*/
if( ( SIR_BAND_5_GHZ == limGetRFBand(nChannelNum))
-#ifdef WLAN_FEATURE_P2P
|| (( pMac->lim.gpLimMlmScanReq != NULL) &&
pMac->lim.gpLimMlmScanReq->p2pSearch )
/* For unicast probe req mgmt from Join function
@@ -398,7 +391,6 @@
one more check whether it is pePersona is P2P_CLIENT or not */
|| ( ( psessionEntry != NULL ) &&
( VOS_P2P_CLIENT_MODE == psessionEntry->pePersona ) )
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -420,7 +412,6 @@
return eSIR_SUCCESS;
} // End limSendProbeReqMgmtFrame.
-#ifdef WLAN_FEATURE_P2P
tSirRetStatus limGetAddnIeForProbeResp(tpAniSirGlobal pMac,
tANI_U8* addIE, tANI_U16 *addnIELen,
tANI_U8 probeReqP2pIe)
@@ -478,7 +469,6 @@
}
return eSIR_SUCCESS;
}
-#endif
void
limSendProbeRspMgmtFrame(tpAniSirGlobal pMac,
@@ -504,14 +494,12 @@
tANI_U32 wpsApEnable=0, tmp;
tANI_U8 txFlag = 0;
tANI_U8 *addIE = NULL;
-#ifdef WLAN_FEATURE_P2P
tANI_U8 *pP2pIe = NULL;
tANI_U8 noaLen = 0;
tANI_U8 total_noaLen = 0;
tANI_U8 noaStream[SIR_MAX_NOA_ATTR_LEN
+ SIR_P2P_IE_HEADER_LEN];
tANI_U8 noaIe[SIR_MAX_NOA_ATTR_LEN + SIR_P2P_IE_HEADER_LEN];
-#endif
if(pMac->gDriverType == eDRIVER_TYPE_MFG) // We don't answer requests
{
@@ -665,7 +653,6 @@
addnIEPresent = false;
-#ifdef WLAN_FEATURE_P2P
if( pMac->lim.gpLimRemainOnChanReq )
{
nBytes += (pMac->lim.gpLimRemainOnChanReq->length - sizeof( tSirRemainOnChnReq ) );
@@ -673,7 +660,6 @@
//Only use CFG for non-listen mode. This CFG is not working for concurrency
//In listening mode, probe rsp IEs is passed in the message from SME to PE
else
-#endif
{
if (wlan_cfgGetInt(pMac, WNI_CFG_PROBE_RSP_ADDNIE_FLAG,
@@ -770,7 +756,6 @@
}
totalAddnIeLen = addnIE1Len + addnIE2Len + addnIE3Len;
-#ifdef WLAN_FEATURE_P2P
if(eSIR_SUCCESS != limGetAddnIeForProbeResp(pMac, addIE, &totalAddnIeLen, probeReqP2pIe))
{
limLog(pMac, LOGP,
@@ -796,7 +781,6 @@
}
}
}
-#endif
}
halstatus = palPktAlloc( pMac->hHdd, HAL_TXRX_FRM_802_11_MGMT,
@@ -865,13 +849,11 @@
pMac->sys.probeRespond++;
-#ifdef WLAN_FEATURE_P2P
if( pMac->lim.gpLimRemainOnChanReq )
{
palCopyMemory ( pMac->hHdd, pFrame+sizeof(tSirMacMgmtHdr)+nPayload,
pMac->lim.gpLimRemainOnChanReq->probeRspIe, (pMac->lim.gpLimRemainOnChanReq->length - sizeof( tSirRemainOnChnReq )) );
}
-#endif
if ( addnIEPresent )
{
@@ -889,7 +871,6 @@
return;
}
}
-#ifdef WLAN_FEATURE_P2P
if (noaLen != 0)
{
if (palCopyMemory ( pMac->hHdd, &pFrame[nBytes - (total_noaLen)],
@@ -899,13 +880,10 @@
FL("Not able to insert NoA because of length constraint"));
}
}
-#endif
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -1161,10 +1139,8 @@
limPrintMacAddr( pMac, peerMacAddr, LOG3 );)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -1248,12 +1224,10 @@
{
pAssocReq =
(tpSirAssocReq) psessionEntry->parsedAssocReq[pSta->assocId];
-#ifdef WLAN_FEATURE_P2P
/* populate P2P IE in AssocRsp when assocReq from the peer includes P2P IE */
if( pAssocReq != NULL && pAssocReq->addIEPresent ) {
PopulateDot11AssocResP2PIE(pMac, &frm.P2PAssocRes, pAssocReq);
}
-#endif
}
}
@@ -1484,10 +1458,8 @@
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -1760,10 +1732,8 @@
limPrintMacAddr( pMac, pMacHdr->da, LOG1 );)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -1941,10 +1911,8 @@
limPrintMacAddr(pMac, pMacHdr->da, LOG1);)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -2310,21 +2278,17 @@
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
-#ifdef WLAN_FEATURE_P2P
if(psessionEntry->pePersona == VOS_P2P_CLIENT_MODE)
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-#endif
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) (sizeof(tSirMacMgmtHdr) + nPayload),
HAL_TXRX_FRM_802_11_MGMT,
@@ -2714,10 +2678,8 @@
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -3092,21 +3054,17 @@
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
-#ifdef WLAN_FEATURE_P2P
if(psessionEntry->pePersona == VOS_P2P_CLIENT_MODE)
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-#endif
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) (sizeof(tSirMacMgmtHdr) + nPayload),
HAL_TXRX_FRM_802_11_MGMT,
@@ -3399,10 +3357,8 @@
PELOG2(sirDumpBuf(pMac, SIR_LIM_MODULE_ID, LOG2, pFrame, frameLen);)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR)
|| ((NULL != pMac->ft.ftPEContext.pFTPreAuthReq)
&& ( SIR_BAND_5_GHZ == limGetRFBand(pMac->ft.ftPEContext.pFTPreAuthReq->preAuthchannelNum)))
@@ -3412,12 +3368,10 @@
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
-#ifdef WLAN_FEATURE_P2P
if(psessionEntry->pePersona == VOS_P2P_CLIENT_MODE)
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-#endif
/// Queue Authentication frame in high priority WQ
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) frameLen,
@@ -3728,22 +3682,18 @@
limPrintMacAddr( pMac, pMacHdr->da, LOG1 );)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
-#ifdef WLAN_FEATURE_P2P
if((psessionEntry->pePersona == VOS_P2P_CLIENT_MODE) ||
(psessionEntry->pePersona == VOS_P2P_GO_MODE))
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-#endif
if (waitForAck)
{
@@ -3908,22 +3858,18 @@
limPrintMacAddr( pMac, pMacHdr->da, LOG1 );)
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
}
-#ifdef WLAN_FEATURE_P2P
if((psessionEntry->pePersona == VOS_P2P_CLIENT_MODE) ||
(psessionEntry->pePersona == VOS_P2P_GO_MODE))
{
txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
}
-#endif
#ifdef FEATURE_WLAN_TDLS
pStaDs = dphLookupHashEntry(pMac, peer, &aid, &psessionEntry->dph.dphHashTable);
@@ -4525,10 +4471,8 @@
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -4643,10 +4587,8 @@
" (0x%08x).\n") );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -4780,10 +4722,8 @@
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -4971,10 +4911,8 @@
limPrintMacAddr( pMac, pMlmAddBAReq->peerMacAddr, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -5171,10 +5109,8 @@
limPrintMacAddr( pMac, pMlmAddBARsp->peerMacAddr, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -5367,10 +5303,8 @@
limPrintMacAddr( pMac, pMlmDelBAReq->peerMacAddr, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -5529,10 +5463,8 @@
limPrintMacAddr( pMac, peer, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -5695,10 +5627,8 @@
limPrintMacAddr( pMac, peer, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
@@ -5883,10 +5813,8 @@
limPrintMacAddr( pMac, peer, LOGW );
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
-#ifdef WLAN_FEATURE_P2P
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
( psessionEntry->pePersona == VOS_P2P_GO_MODE)
-#endif
)
{
txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index eb582c1..ef67aa6 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -687,7 +687,6 @@
}
#endif
-#ifdef WLAN_FEATURE_P2P
cfgValue = 1000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
if (tx_timer_create(&pMac->lim.limTimers.gLimRemainOnChannelTimer,
@@ -702,7 +701,6 @@
goto err_timer;
}
-#endif
cfgValue = 1000;
cfgValue = SYS_MS_TO_TICKS(cfgValue);
@@ -728,7 +726,6 @@
goto err_timer;
}
-#ifdef WLAN_FEATURE_P2P
cfgValue = LIM_INSERT_SINGLESHOTNOA_TIMEOUT_VALUE; // (> no of BI* no of TUs per BI * 1TU in msec + p2p start time offset*1 TU in msec = 2*100*1.024 + 5*1.024 = 204.8 + 5.12 = 209.20)
cfgValue = SYS_MS_TO_TICKS(cfgValue);
if (tx_timer_create(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer,
@@ -740,16 +737,13 @@
limLog(pMac, LOGP, FL("could not create Single Shot NOA Insert Timeout timer\n"));
goto err_timer;
}
-#endif
return TX_SUCCESS;
err_timer:
tx_timer_delete(&pMac->lim.limTimers.gLimDeauthAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimDisassocAckTimer);
-#ifdef WLAN_FEATURE_P2P
tx_timer_delete(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
-#endif
#ifdef FEATURE_WLAN_CCX
tx_timer_delete(&pMac->lim.limTimers.gLimCcxTsmTimer);
#endif
@@ -776,9 +770,7 @@
tx_timer_delete(&pMac->lim.limTimers.gLimMaxChannelTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicProbeReqTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimMinChannelTimer);
-#ifdef WLAN_FEATURE_P2P
tx_timer_delete(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer);
-#endif
if(NULL != pMac->lim.gLimPreAuthTimerTable.pTable)
palFreeMemory(pMac->hHdd, pMac->lim.gLimPreAuthTimerTable.pTable);
@@ -1655,7 +1647,6 @@
}
break;
#endif
-#ifdef WLAN_FEATURE_P2P
case eLIM_REMAIN_CHN_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimRemainOnChannelTimer) != TX_SUCCESS)
{
@@ -1679,7 +1670,6 @@
return;
}
break;
-#endif
case eLIM_DISASSOC_ACK_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimDisassocAckTimer) != TX_SUCCESS)
{
@@ -1728,7 +1718,6 @@
}
break;
-#ifdef WLAN_FEATURE_P2P
case eLIM_INSERT_SINGLESHOT_NOA_TIMER:
if (tx_timer_deactivate(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer) != TX_SUCCESS)
{
@@ -1752,7 +1741,6 @@
return;
}
break;
-#endif
default:
// Invalid timerId. Log error
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index 858bd1a..a1e6700 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.h
@@ -83,9 +83,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
eLIM_FT_PREAUTH_RSP_TIMER,
#endif
-#ifdef WLAN_FEATURE_P2P
eLIM_REMAIN_CHN_TIMER,
-#endif
eLIM_PERIODIC_PROBE_REQ_TIMER,
#ifdef FEATURE_WLAN_CCX
eLIM_TSM_TIMER,
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index f0f31fd..b3c16a8 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -99,9 +99,7 @@
#ifdef WLAN_FEATURE_VOWIFI_11R
CASE_RETURN_STRING(eLIM_FT_PREAUTH_RSP_TIMER);
#endif
-#ifdef WLAN_FEATURE_P2P
CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER);
-#endif
CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER);
#ifdef FEATURE_WLAN_CCX
CASE_RETURN_STRING(eLIM_TSM_TIMER);
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 034b11d..2aa2c47 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -674,9 +674,7 @@
void limProcessDisassocFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
void limProcessDeauthFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
void limProcessActionFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
-#if defined WLAN_FEATURE_P2P
void limProcessActionFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxMetaInfo);
-#endif
tSirRetStatus limPopulateMacHeader(tpAniSirGlobal, tANI_U8*, tANI_U8, tANI_U8, tSirMacAddr,tSirMacAddr);
@@ -1061,7 +1059,6 @@
limChangeChannelWithCallback(tpAniSirGlobal pMac, tANI_U8 newChannel,
CHANGE_CHANNEL_CALLBACK callback, tANI_U32 *cbdata, tpPESession psessionEntry);
-#ifdef WLAN_FEATURE_P2P
void limSendSmeMgmtFrameInd(
tpAniSirGlobal pMac, tANI_U8 frameType,
tANI_U8 *frame, tANI_U32 frameLen, tANI_U16 sessionId,
@@ -1072,7 +1069,6 @@
void limSendP2PActionFrame(tpAniSirGlobal pMac, tpSirMsgQ pMsg);
void limAbortRemainOnChan(tpAniSirGlobal pMac);
tSirRetStatus __limProcessSmeNoAUpdate(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf);
-#endif
#ifdef FEATURE_WLAN_TDLS_INTERNAL
void limProcessTdlsFrame(tpAniSirGlobal, tANI_U32 *);
void limProcessTdlsPublicActionFrame(tpAniSirGlobal pMac, tANI_U32 *pBd,
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 32e4103..04a1bc5 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1075,11 +1075,9 @@
tx_timer_delete(&pMac->lim.limTimers.gLimFTPreAuthRspTimer);
#endif
-#ifdef WLAN_FEATURE_P2P
// Deactivate and delete remain on channel timer
tx_timer_deactivate(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
-#endif
#ifdef FEATURE_WLAN_CCX
// Deactivate and delete TSM
@@ -1093,10 +1091,8 @@
tx_timer_deactivate(&pMac->lim.limTimers.gLimDeauthAckTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimDeauthAckTimer);
-#ifdef WLAN_FEATURE_P2P
tx_timer_deactivate(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer);
tx_timer_delete(&pMac->lim.limTimers.gLimP2pSingleShotNoaInsertTimer);
-#endif
pMac->lim.gLimTimersCreated = 0;
}
@@ -7380,7 +7376,6 @@
return NULL;
}
-#ifdef WLAN_FEATURE_P2P
//Returns length of P2P stream and Pointer ie passed to this function is filled with noa stream
v_U8_t limBuildP2pIe(tpAniSirGlobal pMac, tANI_U8 *ie, tANI_U8 *data, tANI_U8 ie_len)
@@ -7545,7 +7540,6 @@
return FALSE;
}
-#endif
tANI_BOOLEAN limIsconnectedOnDFSChannel(tANI_U8 currentChannel)
{
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index df564ab..3a1f9b6 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -382,7 +382,6 @@
#define limGetWscIEPtr(pMac, ie, ie_len) \
limGetVendorIEOuiPtr(pMac, SIR_MAC_WSC_OUI, SIR_MAC_WSC_OUI_SIZE, ie, ie_len)
-#ifdef WLAN_FEATURE_P2P
#define limGetP2pIEPtr(pMac, ie, ie_len) \
limGetVendorIEOuiPtr(pMac, SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE, ie, ie_len)
@@ -391,7 +390,6 @@
v_U8_t limBuildP2pIe(tpAniSirGlobal pMac, tANI_U8 *ie, tANI_U8 *data, tANI_U8 ie_len);
tANI_BOOLEAN limIsNOAInsertReqd(tpAniSirGlobal pMac);
-#endif
v_U8_t* limGetVendorIEOuiPtr(tpAniSirGlobal pMac, tANI_U8 *oui, tANI_U8 oui_size, tANI_U8 *ie, tANI_U16 ie_len);
tANI_BOOLEAN limIsconnectedOnDFSChannel(tANI_U8 currentChannel);
tANI_U8 limGetCurrentOperatingChannel(tpAniSirGlobal pMac);
diff --git a/CORE/MAC/src/pe/sch/schApi.c b/CORE/MAC/src/pe/sch/schApi.c
index 0b65b64..cb97dd2 100644
--- a/CORE/MAC/src/pe/sch/schApi.c
+++ b/CORE/MAC/src/pe/sch/schApi.c
@@ -324,9 +324,7 @@
palCopyMemory(pMac, beaconParams->bssId, psessionEntry->bssId, sizeof(psessionEntry->bssId));
beaconParams->timIeOffset = pMac->sch.schObject.gSchBeaconOffsetBegin;
-#ifdef WLAN_FEATURE_P2P
beaconParams->p2pIeOffset = pMac->sch.schObject.p2pIeOffset;
-#endif
#ifdef WLAN_SOFTAP_FW_BEACON_TX_PRNT_LOG
schLog(pMac, LOGE,FL("TimIeOffset:[%d]\n"),beaconParams->TimIeOffset );
#endif
diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c
index a811e22..4b0e5d0 100644
--- a/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -77,7 +77,6 @@
const tANI_U8 P2pOui[] = {0x50, 0x6F, 0x9A, 0x9};
-#if defined(WLAN_FEATURE_P2P)
tSirRetStatus schGetP2pIeOffset(tANI_U8 *pExtraIe, tANI_U32 extraIeLen, tANI_U16 *pP2pIeOffset)
{
tSirRetStatus status = eSIR_FAILURE;
@@ -107,7 +106,6 @@
return status;
}
-#endif
tSirRetStatus schAppendAddnIE(tpAniSirGlobal pMac, tpPESession psessionEntry,
tANI_U8 *pFrame, tANI_U32 maxBeaconSize,
@@ -141,7 +139,6 @@
WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA, &addIE[0], &len))
== eSIR_SUCCESS)
{
-#ifdef WLAN_FEATURE_P2P
tANI_U8* pP2pIe = limGetP2pIEPtr(pMac, &addIE[0], len);
if(pP2pIe != NULL)
{
@@ -165,7 +162,6 @@
}
}
}
-#endif
vos_mem_copy(pFrame, &addIE[0], len);
*nBytes = *nBytes + len;
}
@@ -203,13 +199,11 @@
tANI_U32 i, nStatus, nBytes;
tANI_U32 wpsApEnable=0, tmp;
tDot11fIEWscProbeRes *pWscProbeRes;
-#ifdef WLAN_FEATURE_P2P
tANI_U8 *pExtraIe = NULL;
tANI_U32 extraIeLen =0;
tANI_U16 extraIeOffset = 0;
tANI_U16 p2pIeOffset = 0;
tSirRetStatus status = eSIR_SUCCESS;
-#endif
status = palAllocateMemory(pMac->hHdd, (void **)&pBcn1, sizeof(tDot11fBeacon1));
if(status != eSIR_SUCCESS)
@@ -461,10 +455,8 @@
"t11fBeacon2 (0x%08x.).\n"), nStatus );
}
-#if defined(WLAN_FEATURE_P2P)
pExtraIe = pMac->sch.schObject.gSchBeaconFrameEnd + nBytes;
extraIeOffset = nBytes;
-#endif
//TODO: Append additional IE here.
schAppendAddnIE(pMac, psessionEntry,
@@ -473,7 +465,6 @@
pMac->sch.schObject.gSchBeaconOffsetEnd = ( tANI_U16 )nBytes;
-#if defined(WLAN_FEATURE_P2P)
extraIeLen = nBytes - extraIeOffset;
//Get the p2p Ie Offset
@@ -490,7 +481,6 @@
{
pMac->sch.schObject.p2pIeOffset = 0;
}
-#endif
schLog( pMac, LOG1, FL("Initialized beacon end, offset %d\n"),
pMac->sch.schObject.gSchBeaconOffsetEnd );