summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CORE/MAC/inc/aniGlobal.h6
-rw-r--r--CORE/MAC/inc/qwlan_version.h2
-rw-r--r--CORE/MAC/inc/sirApi.h17
-rw-r--r--CORE/MAC/inc/wniApi.h2
-rw-r--r--CORE/MAC/src/include/sirParams.h6
-rw-r--r--CORE/MAC/src/pe/include/limGlobal.h8
-rw-r--r--CORE/MAC/src/pe/lim/limLogDump.c17
-rw-r--r--CORE/MAC/src/pe/lim/limP2P.c2
-rw-r--r--CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c4
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMessageQueue.c71
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c7
-rw-r--r--CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c8
-rw-r--r--CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c4
-rw-r--r--CORE/MAC/src/pe/lim/limProcessTdls.c10
-rw-r--r--CORE/MAC/src/pe/lim/limSendManagementFrames.c4
-rw-r--r--CORE/MAC/src/pe/lim/limSendSmeRspMessages.c2
-rw-r--r--CORE/MAC/src/pe/lim/limSendSmeRspMessages.h2
-rw-r--r--CORE/MAC/src/pe/lim/limSession.c14
-rw-r--r--CORE/MAC/src/pe/lim/limTypes.h4
19 files changed, 0 insertions, 190 deletions
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 6ba7f650365f..a1e686e2af2c 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -143,13 +143,11 @@ typedef struct sAniSirGlobal *tpAniSirGlobal;
#define EQUALS_TO_ASCII_VALUE (61)
#endif
-#ifdef QCA_WIFI_2_0
#define WLAN_HOST_SEQ_NUM_MIN 2048
#define WLAN_HOST_SEQ_NUM_MAX 4095
#define LOW_SEQ_NUM_MASK 0x000F
#define HIGH_SEQ_NUM_MASK 0x0FF0
#define HIGH_SEQ_NUM_OFFSET 4
-#endif /* QCA_WIFI_2_0 */
// -------------------------------------------------------------------
// Change channel generic scheme
@@ -977,10 +975,8 @@ typedef struct sMacOpenParameters
tANI_U16 RArateLimitInterval;
v_BOOL_t IsRArateLimitEnabled;
#endif
-#if !defined(QCA_WIFI_ISOC)
/* is RX re-ordering offloaded to the fw */
tANI_U8 reorderOffload;
-#endif
/* dfs radar pri multiplier */
tANI_S32 dfsRadarPriMultiplier;
@@ -1079,9 +1075,7 @@ typedef struct sAniSirGlobal
tANI_U8 lteCoexAntShare;
tANI_U8 beacon_offload;
tANI_U32 fEnableDebugLog;
-#ifdef QCA_WIFI_2_0
tANI_U16 mgmtSeqNum;
-#endif /* QCA_WIFI_2_0 */
v_BOOL_t enable5gEBT;
/* Miracast session 0-Disabled, 1-Source, 2-sink*/
tANI_U8 fMiracastSessionPresent;
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 71b527af8a50..17dbcf84e4d9 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -46,7 +46,6 @@ BRIEF DESCRIPTION:
#define QWLAN_VERSIONSTR "1.0.0.172"
-#ifdef QCA_WIFI_2_0
#define AR6320_REV1_VERSION 0x5000000
#define AR6320_REV1_1_VERSION 0x5000001
@@ -60,6 +59,5 @@ struct qwlan_hw {
const char *name;
};
-#endif
#endif /* QWLAN_VERSION_H */
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 4820e9363248..6217bb47cdad 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -975,18 +975,10 @@ typedef struct sSirSmeScanChanReq
#ifdef FEATURE_OEM_DATA_SUPPORT
#ifndef OEM_DATA_REQ_SIZE
-#ifdef QCA_WIFI_2_0
#define OEM_DATA_REQ_SIZE 280
-#else
-#define OEM_DATA_REQ_SIZE 134
-#endif
#endif
#ifndef OEM_DATA_RSP_SIZE
-#ifdef QCA_WIFI_2_0
#define OEM_DATA_RSP_SIZE 1724
-#else
-#define OEM_DATA_RSP_SIZE 1968
-#endif
#endif
typedef struct sSirOemDataReq
@@ -3019,13 +3011,8 @@ typedef struct sSmeCsaOffloadInd
/// WOW related structures
// SME -> PE <-> HAL
-#ifdef QCA_WIFI_2_0
#define SIR_WOWL_BCAST_PATTERN_MAX_SIZE 146
#define SIR_WOWL_BCAST_MAX_NUM_PATTERNS 19
-#else
-#define SIR_WOWL_BCAST_PATTERN_MAX_SIZE 128
-#define SIR_WOWL_BCAST_MAX_NUM_PATTERNS 16
-#endif
// SME -> PE -> HAL - This is to add WOWL BCAST wake-up pattern.
// SME/HDD maintains the list of the BCAST wake-up patterns.
// This is a pass through message for PE
@@ -4164,7 +4151,6 @@ typedef struct sSirMgmtTxCompletionInd
tANI_U32 txCompleteStatus;
} tSirMgmtTxCompletionInd, *tpSirMgmtTxCompletionInd;
-#ifdef QCA_WIFI_2_0
typedef struct sSirTdlsEventNotify
{
tANI_U8 sessionId;
@@ -4172,7 +4158,6 @@ typedef struct sSirTdlsEventNotify
tANI_U16 messageType;
tANI_U32 peer_reason;
} tSirTdlsEventNotify;
-#endif
#endif /* FEATURE_WLAN_TDLS */
@@ -4220,9 +4205,7 @@ typedef struct sAniHandoffReq
tANI_U8 sessionId;
tANI_U8 bssid[VOS_MAC_ADDR_SIZE];
tANI_U8 channel;
-#ifndef QCA_WIFI_ISOC
tANI_U8 handoff_src;
-#endif
} tAniHandoffReq, *tpAniHandoffReq;
typedef struct sSirScanOffloadReq {
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index 26f5910cc13e..360c0d499e3e 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -331,12 +331,10 @@ enum eWniMsgTypes
eWNI_SME_MGMT_FRM_TX_COMPLETION_IND,
eWNI_SME_TDLS_LINK_ESTABLISH_REQ,
eWNI_SME_TDLS_LINK_ESTABLISH_RSP,
-#ifdef QCA_WIFI_2_0
eWNI_SME_TDLS_SHOULD_DISCOVER,
eWNI_SME_TDLS_SHOULD_TEARDOWN,
eWNI_SME_TDLS_PEER_DISCONNECTED,
#endif
-#endif
//NOTE: If you are planning to add more mesages, please make sure that
//SIR_LIM_ITC_MSG_TYPES_BEGIN is moved appropriately. It is set as
//SIR_LIM_MSG_TYPES_BEGIN+0xB0 = 12B0 (which means max of 176 messages and
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 49cb89cf0533..7a8a510dd513 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -528,13 +528,11 @@ typedef struct sSirMbMsgP2p
#define SIR_HAL_START_ROAM_CANDIDATE_LOOKUP_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 222)
-#ifdef QCA_WIFI_2_0
#define SIR_HAL_CLI_SET_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 223)
#define SIR_HAL_CLI_GET_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 224)
#ifndef REMOVE_PKT_LOG
#define SIR_HAL_PKTLOG_ENABLE_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 225)
#endif
-#endif
#ifdef FEATURE_WLAN_SCAN_PNO
#define SIR_HAL_SME_SCAN_CACHE_UPDATED (SIR_HAL_ITC_MSG_TYPES_BEGIN + 226)
#endif
@@ -553,7 +551,6 @@ typedef struct sSirMbMsgP2p
#define SIR_HAL_UPDATE_USERPOS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 236)
#endif
-#ifdef QCA_WIFI_2_0
#ifdef FEATURE_WLAN_TDLS
#define SIR_HAL_UPDATE_FW_TDLS_STATE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 237)
#define SIR_HAL_UPDATE_TDLS_PEER_STATE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 238)
@@ -561,7 +558,6 @@ typedef struct sSirMbMsgP2p
#define SIR_HAL_TDLS_SHOULD_TEARDOWN (SIR_HAL_ITC_MSG_TYPES_BEGIN + 240)
#define SIR_HAL_TDLS_PEER_DISCONNECTED (SIR_HAL_ITC_MSG_TYPES_BEGIN + 241)
#endif
-#endif
/* Handling of beacon tx indication from FW */
#define SIR_HAL_BEACON_TX_SUCCESS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 242)
@@ -594,9 +590,7 @@ typedef struct sSirMbMsgP2p
#define SIR_HAL_STATS_EXT_EVENT (SIR_HAL_ITC_MSG_TYPES_BEGIN + 260)
#endif /* WLAN_FEATURE_STATS_EXT */
-#ifdef QCA_WIFI_2_0
#define SIR_HAL_HIDE_SSID_VDEV_RESTART (SIR_HAL_ITC_MSG_TYPES_BEGIN + 261)
-#endif /* QCA_WIFI_2_0 */
#define SIR_HAL_VDEV_START_RSP_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 262)
#define SIR_HAL_GET_LINK_SPEED (SIR_HAL_ITC_MSG_TYPES_BEGIN + 263)
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index e8750ac08f07..543b22fc3229 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -314,18 +314,10 @@ struct tLimScanResultNode
#ifdef FEATURE_OEM_DATA_SUPPORT
#ifndef OEM_DATA_REQ_SIZE
-#ifdef QCA_WIFI_2_0
#define OEM_DATA_REQ_SIZE 280
-#else
-#define OEM_DATA_REQ_SIZE 134
-#endif
#endif
#ifndef OEM_DATA_RSP_SIZE
-#ifdef QCA_WIFI_2_0
#define OEM_DATA_RSP_SIZE 1724
-#else
-#define OEM_DATA_RSP_SIZE 1968
-#endif
#endif
// OEM Data related structure definitions
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index b68bddf2c183..34ff3082a61a 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -2434,20 +2434,6 @@ dump_set_max_probe_req(tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2,
pMac->lim.maxProbe = arg1;
return p;
}
-#ifndef QCA_WIFI_2_0
-/* API to fill Rate Info based on mac efficiency
- * arg 1: mac efficiency to be used to calculate mac thorughput for a given rate index
- * arg 2: starting rateIndex to apply the macEfficiency to
- * arg 3: ending rateIndex to apply the macEfficiency to
- */
-static char *
-dump_limRateInfoBasedOnMacEff(tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32 arg3, tANI_U32 arg4, char *p)
-{
- limLog(pMac, LOGE, FL("arg1 %u, arg2 %u, arg3 %u"), arg1, arg2, arg3);
- WDTS_FillRateInfo((tANI_U8)(arg1), (tANI_U16)(arg2), (tANI_U16)(arg3));
- return p;
-}
-#endif /* QCA_WIFI_2_0 */
static tDumpFuncEntry limMenuDumpTable[] = {
{0, "PE (300-499)", NULL},
@@ -2522,9 +2508,6 @@ static tDumpFuncEntry limMenuDumpTable[] = {
{369, "PE.LIM: pkts/rateIdx: iwpriv wlan0 dump 369 <staId> <boolean to flush counter>", dump_lim_get_pkts_rcvd_per_rate_idx},
{370, "PE.LIM: pkts/rssi: : iwpriv wlan0 dump 370 <staId> <boolean to flush counter>", dump_lim_get_pkts_rcvd_per_rssi_values},
#endif
-#ifndef QCA_WIFI_2_0
- {371, "PE.LIM: MAS RX stats MAC eff <MAC eff in percentage>", dump_limRateInfoBasedOnMacEff},
-#endif /* QCA_WIFI_2_0 */
#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
{372, "PE.LIM: send PLM start command Usage: iwpriv wlan0 372", dump_send_plm_start },
#endif
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index 5139da8ade52..0daddf4be5c3 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -1111,11 +1111,9 @@ send_frame1:
// Paranoia:
vos_mem_set(pFrame, nBytes, 0);
-#ifdef QCA_WIFI_2_0
/* Add sequence number to action frames */
/* Frames are handed over in .11 format by supplicant already */
limPopulateP2pMacHeader(pMac, (tANI_U8*)pMbMsg->data);
-#endif /* QCA_WIFI_2_0 */
if ((noaLen > 0) && (noaLen<(SIR_MAX_NOA_ATTR_LEN + SIR_P2P_IE_HEADER_LEN)))
{
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index b8877ae17dad..d89788ecaef6 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -774,11 +774,7 @@ limProcessAssocReqFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,
if (pStaDs == NULL)
{
/// Requesting STA is not currently associated
-#ifdef QCA_WIFI_2_0
if (peGetCurrentSTAsCount(pMac) == pMac->lim.gLimAssocStaLimit)
-#else
- if (peGetCurrentSTAsCount(pMac) == pMac->lim.maxStation)
-#endif
{
/**
* Maximum number of STAs that AP can handle reached.
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 8e868962dad7..bfcb0c9fc34c 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -80,10 +80,6 @@
#include "vos_packet.h"
#include "vos_memory.h"
-#ifdef QCA_WIFI_ISOC
-/* This value corresponds to 500 ms */
-#define MAX_PROBEREQ_TIME 5000
-#endif
void limLogSessionStates(tpAniSirGlobal pMac);
/** -------------------------------------------------------------
@@ -965,73 +961,20 @@ void limOemDataRspHandleResumeLinkRsp(tpAniSirGlobal pMac, eHalStatus status, tA
void limProcessOemDataRsp(tpAniSirGlobal pMac, tANI_U32* body)
{
tpLimMlmOemDataRsp mlmOemDataRsp = NULL;
-#ifndef QCA_WIFI_2_0
- tpStartOemDataRsp oemDataRsp = NULL;
-#endif
//Process all the messages for the lim queue
SET_LIM_PROCESS_DEFD_MESGS(pMac, true);
-#ifndef QCA_WIFI_2_0
- oemDataRsp = (tpStartOemDataRsp)(body);
-
- mlmOemDataRsp = vos_mem_malloc(sizeof(tLimMlmOemDataRsp));
- if ( NULL == mlmOemDataRsp )
- {
- limLog(pMac, LOGP, FL("could not allocate memory for mlmOemDataRsp"));
- return;
- }
-
- //copy the memory into tLimMlmOemDataRsp and free the tStartOemDataRsp
- //the structures tStartOemDataRsp and tLimMlmOemDataRsp have the same structure
- vos_mem_copy((void*)(mlmOemDataRsp), (void*)(oemDataRsp),
- sizeof(tLimMlmOemDataRsp));
-
- //Now free the incoming memory
- vos_mem_free(oemDataRsp);
-
- limResumeLink(pMac, limOemDataRspHandleResumeLinkRsp, (tANI_U32*)mlmOemDataRsp);
-#else
mlmOemDataRsp = (tpLimMlmOemDataRsp) body;
PELOG1(limLog(pMac, LOG1, FL("%s: sending oem data response msg to sme"),
__func__);)
limPostSmeMessage(pMac, LIM_MLM_OEM_DATA_CNF, (tANI_U32*)(mlmOemDataRsp));
-#endif
return;
}
#endif
-#ifdef QCA_WIFI_ISOC
-static tANI_BOOLEAN limAgeOutProbeReq( tpAniSirGlobal pMac, tpSirMsgQ limMsg,
- vos_pkt_t *pVosPkt )
-{
- tANI_U8 *pRxPacketInfo = NULL;
- tSirMacFrameCtl fc;
- tpSirMacMgmtHdr pHdr=NULL;
- tANI_BOOLEAN match = VOS_FALSE;
-
- limGetBDfromRxPacket(pMac, limMsg->bodyptr, (tANI_U32 **)&pRxPacketInfo);
- pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
- fc = pHdr->fc;
- if ( fc.subType == SIR_MAC_MGMT_PROBE_REQ )
- {
- if( vos_timer_get_system_ticks() - pVosPkt->pkt_meta.timestamp >= MAX_PROBEREQ_TIME )
- {
- // drop packet
- limLog(pMac, LOGE,
- FL("Dropping Aged Out probe requests. Peer MAC is "MAC_ADDRESS_STR),
- MAC_ADDR_ARRAY(pHdr->sa));
-
- vos_pkt_return_packet(pVosPkt);
- match = VOS_TRUE;
- }
- }
-
- return match;
-}
-#endif
/**
* limProcessMessages
@@ -1195,18 +1138,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
break;
}
-#ifdef QCA_WIFI_ISOC
- /*
- * putting a check for age out probe request frames
- * such that any probe req more than 0.5 sec old can directly
- * be dropped. With this, there won't be blocking of MC thread.
- */
-
- if( limAgeOutProbeReq ( pMac, &limMsgNew, pVosPkt ))
- {
- break;
- }
-#endif
limHandle80211Frames(pMac, &limMsgNew, &deferMsg);
if ( deferMsg == true )
@@ -1734,7 +1665,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
#ifdef FEATURE_WLAN_TDLS
-#ifdef QCA_WIFI_2_0
case SIR_HAL_TDLS_SHOULD_DISCOVER:
case SIR_HAL_TDLS_SHOULD_TEARDOWN:
case SIR_HAL_TDLS_PEER_DISCONNECTED:
@@ -1745,7 +1675,6 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
(void *)limMsg->bodyptr);
break;
#endif
-#endif
case WDA_ADD_BSS_RSP:
limProcessMlmAddBssRsp( pMac, limMsg );
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index d6608fa6e9f5..d2e9c490800c 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -1996,16 +1996,9 @@ static void limProcessMlmOemDataReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
pMac->lim.gLimPrevMlmState = pMac->lim.gLimMlmState;
-#ifdef QCA_WIFI_2_0
PELOG2(limLog(pMac, LOG2,
FL("%s: Calling limSendHalOemDataReq"), __func__);)
limSendHalOemDataReq(pMac);
-#else
- MTRACE(macTrace(pMac, TRACE_CODE_MLM_STATE, NO_SESSION, pMac->lim.gLimMlmState));
-
- //Now request for link suspension
- limSuspendLink(pMac, eSIR_CHECK_LINK_TRAFFIC_BEFORE_SCAN, limSetOemDataReqMode, NULL);
-#endif
}
else
{
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index ac227b7e32b2..5c76ad910184 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -62,9 +62,7 @@
#include "wlan_qct_wda.h"
#include "vos_utils.h"
-#ifdef QCA_WIFI_2_0
#define MAX_SUPPORTED_PEERS_WEP 16
-#endif
static void limHandleSmeJoinResult(tpAniSirGlobal, tSirResultCodes, tANI_U16,tpPESession);
static void limHandleSmeReaasocResult(tpAniSirGlobal, tSirResultCodes, tANI_U16, tpPESession);
@@ -2468,9 +2466,7 @@ limProcessApMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ)
tLimMlmStartCnf mlmStartCnf;
tANI_U32 val;
tpPESession psessionEntry;
-#ifdef QCA_WIFI_2_0
tANI_U8 isWepEnabled = FALSE;
-#endif
tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr;
if(NULL == pAddBssParams )
{
@@ -2525,7 +2521,6 @@ limProcessApMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ)
psessionEntry->limSystemRole = eLIM_STA_IN_IBSS_ROLE;
schEdcaProfileUpdate(pMac, psessionEntry);
limInitPreAuthList(pMac);
-#ifdef QCA_WIFI_2_0
/* Check the SAP security configuration.If configured to
* WEP then max clients supported is 16
*/
@@ -2543,7 +2538,6 @@ limProcessApMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ)
}
}
}
-#endif
limInitPeerIdxpool(pMac,psessionEntry);
// Start OLBC timer
@@ -2559,13 +2553,11 @@ limProcessApMlmAddBssRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ)
// Apply previously set configuration at HW
limApplyConfiguration(pMac,psessionEntry);
-#ifdef QCA_WIFI_2_0
/* In limApplyConfiguration gLimAssocStaLimit is assigned from cfg.
* So update the value to 16 in case SoftAP is configured in WEP.
*/
if ((pMac->lim.gLimAssocStaLimit > MAX_SUPPORTED_PEERS_WEP) && (isWepEnabled))
pMac->lim.gLimAssocStaLimit = MAX_SUPPORTED_PEERS_WEP;
-#endif
psessionEntry->staId = pAddBssParams->staContext.staIdx;
mlmStartCnf.resultCode = eSIR_SME_SUCCESS;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 3868828947ad..97189486abb7 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -4583,7 +4583,6 @@ end:
return;
} /*** end __limProcessSmeUpdateAPWPSIEs(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) ***/
-#ifdef QCA_WIFI_2_0
void
limSendVdevRestart(tpAniSirGlobal pMac,
tpPESession psessionEntry,
@@ -4620,7 +4619,6 @@ limSendVdevRestart(tpAniSirGlobal pMac,
vos_mem_free(pHalHiddenSsidVdevRestart);
}
}
-#endif /* QCA_WIFI_2_0 */
static void
__limProcessSmeHideSSID(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
@@ -4649,10 +4647,8 @@ __limProcessSmeHideSSID(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
/* Update the session entry */
psessionEntry->ssidHidden = pUpdateParams->ssidHidden;
-#ifdef QCA_WIFI_2_0
/* Send vdev restart */
limSendVdevRestart(pMac, psessionEntry, pUpdateParams->sessionId);
-#endif /* QCA_WIFI_2_0 */
/* Update beacon */
schSetFixedBeaconFields(pMac, psessionEntry);
diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c
index 25e1c339d7fb..280c7074a2b7 100644
--- a/CORE/MAC/src/pe/lim/limProcessTdls.c
+++ b/CORE/MAC/src/pe/lim/limProcessTdls.c
@@ -760,7 +760,6 @@ static tSirRetStatus limSendTdlsDisRspFrame(tpAniSirGlobal pMac,
* Transmit Discovery response and watch if this is delivered to
* peer STA.
*/
-#ifdef QCA_WIFI_2_0
/* In CLD 2.0, pass Discovery Response as mgmt frame so that
* wma does not do header conversion to 802.3 before calling tx/rx
* routine and subsequenly target also sends frame as is OTA
@@ -772,15 +771,6 @@ static tSirRetStatus limSendTdlsDisRspFrame(tpAniSirGlobal pMac,
limTxComplete, pFrame,
limMgmtTXComplete,
HAL_USE_SELF_STA_REQUESTED_MASK, smeSessionId, false );
-#else
- halstatus = halTxFrameWithTxComplete( pMac, pPacket, ( tANI_U16 ) nBytes,
- HAL_TXRX_FRM_802_11_DATA,
- ANI_TXDIR_IBSS,
- 0,
- limTxComplete, pFrame,
- limMgmtTXComplete,
- HAL_USE_SELF_STA_REQUESTED_MASK, smeSessionId, false );
-#endif
if ( ! HAL_STATUS_SUCCESS ( halstatus ) )
{
pMac->lim.mgmtFrameSessionId = 0xff;
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 355cf4a7ea16..589b04147966 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -216,7 +216,6 @@ void limMergeExtCapIEStruct(tDot11fIEExtCap *pDst,
}
}
-#ifdef QCA_WIFI_2_0
/**
*
* \brief This function is called to add the sequence number to the
@@ -280,7 +279,6 @@ limPopulateP2pMacHeader(tpAniSirGlobal pMac, tANI_U8* pBD)
pMacHdr->seqControl.seqNumHi,
pMac->mgmtSeqNum);
}
-#endif /* QCA_WIFI_2_0 */
/**
*
@@ -337,14 +335,12 @@ tSirRetStatus limPopulateMacHeader( tpAniSirGlobal pMac,
(tANI_U8 *) peerAddr,
sizeof( tSirMacAddr ));
-#ifdef QCA_WIFI_2_0
/* Prepare sequence number */
limAddMgmtSeqNum(pMac, pMacHdr);
limLog(pMac, LOG1,"seqNumLo=%d, seqNumHi=%d, mgmtSeqNum=%d",
pMacHdr->seqControl.seqNumLo,
pMacHdr->seqControl.seqNumHi,
pMac->mgmtSeqNum);
-#endif /* QCA_WIFI_2_0 */
return statusCode;
} /*** end limPopulateMacHeader() ***/
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index 998da5ae7a4a..ad56d7c774a8 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -1738,7 +1738,6 @@ limSendSmeMgmtTXCompletion(tpAniSirGlobal pMac,
return;
}/*** end limSendSmeTDLSDeleteAllPeerInd() ***/
-#ifdef QCA_WIFI_2_0
void limSendSmeTdlsEventNotify(tpAniSirGlobal pMac, tANI_U16 msgType,
void *events)
{
@@ -1762,7 +1761,6 @@ void limSendSmeTdlsEventNotify(tpAniSirGlobal pMac, tANI_U16 msgType,
limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT);
return;
}
-#endif /* QCA_WIFI_2_0 */
#endif /* FEATURE_WLAN_TDLS */
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
index e52d3ffb8778..676a9f8cab9c 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
@@ -115,11 +115,9 @@ void limSendSmeTdlsTeardownRsp(tpAniSirGlobal pMac, tSirResultCodes statusCode,
void limSendSmeTdlsLinkEstablishReqRsp(tpAniSirGlobal pMac,
tANI_U8 sessionId, tSirMacAddr peerMac, tDphHashNode *pStaDs,
tANI_U8 status);
-#ifdef QCA_WIFI_2_0
void limSendSmeTdlsEventNotify(tpAniSirGlobal pMac, tANI_U16 msgType,
void *events);
#endif
-#endif
void limSendSmeDfsEventNotify(tpAniSirGlobal pMac, tANI_U16 msgType,
void *event);
diff --git a/CORE/MAC/src/pe/lim/limSession.c b/CORE/MAC/src/pe/lim/limSession.c
index 1089c9756b70..0ca2caa05879 100644
--- a/CORE/MAC/src/pe/lim/limSession.c
+++ b/CORE/MAC/src/pe/lim/limSession.c
@@ -119,25 +119,15 @@ tpPESession peCreateSession(tpAniSirGlobal pMac,
vos_mem_set((void*)&pMac->lim.gpSession[i], sizeof(tPESession), 0);
//Allocate space for Station Table for this session.
-#ifdef QCA_WIFI_2_0
pMac->lim.gpSession[i].dph.dphHashTable.pHashTable = vos_mem_malloc(
sizeof(tpDphHashNode)* (numSta + 1));
-#else
- pMac->lim.gpSession[i].dph.dphHashTable.pHashTable = vos_mem_malloc(
- sizeof(tpDphHashNode)*numSta);
-#endif
if ( NULL == pMac->lim.gpSession[i].dph.dphHashTable.pHashTable )
{
limLog(pMac, LOGE, FL("memory allocate failed!"));
return NULL;
}
-#ifdef QCA_WIFI_2_0
pMac->lim.gpSession[i].dph.dphHashTable.pDphNodeArray = vos_mem_malloc(
sizeof(tDphHashNode) * (numSta + 1));
-#else
- pMac->lim.gpSession[i].dph.dphHashTable.pDphNodeArray = vos_mem_malloc(
- sizeof(tDphHashNode)*numSta);
-#endif
if ( NULL == pMac->lim.gpSession[i].dph.dphHashTable.pDphNodeArray )
{
limLog(pMac, LOGE, FL("memory allocate failed!"));
@@ -146,11 +136,7 @@ tpPESession peCreateSession(tpAniSirGlobal pMac,
return NULL;
}
-#ifdef QCA_WIFI_2_0
pMac->lim.gpSession[i].dph.dphHashTable.size = numSta + 1;
-#else
- pMac->lim.gpSession[i].dph.dphHashTable.size = numSta;
-#endif
dphHashTableClassInit(pMac,
&pMac->lim.gpSession[i].dph.dphHashTable);
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index b6a4d76e40f3..6ca2a2ad7e1b 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -656,9 +656,7 @@ void limProcessDeauthFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
void limProcessActionFrame(tpAniSirGlobal, tANI_U8 *,tpPESession);
void limProcessActionFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxMetaInfo);
-#ifdef QCA_WIFI_2_0
void limPopulateP2pMacHeader(tpAniSirGlobal, tANI_U8*);
-#endif /* QCA_WIFI_2_0 */
tSirRetStatus limPopulateMacHeader(tpAniSirGlobal, tANI_U8*, tANI_U8, tANI_U8, tSirMacAddr,tSirMacAddr);
tSirRetStatus limSendProbeReqMgmtFrame(tpAniSirGlobal, tSirMacSSid *, tSirMacAddr, tANI_U8, tSirMacAddr, tANI_U32, tANI_U32, tANI_U8 *);
void limSendProbeRspMgmtFrame(tpAniSirGlobal, tSirMacAddr, tpAniSSID, short, tANI_U8, tpPESession, tANI_U8);
@@ -1015,10 +1013,8 @@ limGetIElenFromBssDescription(tpSirBssDescription pBssDescr)
void
limSendBeaconInd(tpAniSirGlobal pMac, tpPESession psessionEntry);
-#ifdef QCA_WIFI_2_0
void
limSendVdevRestart(tpAniSirGlobal pMac, tpPESession psessionEntry, tANI_U8 sessionId);
-#endif /* QCA_WIFI_2_0 */
void limGetWPSPBCSessions(tpAniSirGlobal pMac, tANI_U8 *addr, tANI_U8 *uuid_e, eWPSPBCOverlap *overlap, tpPESession psessionEntry);
void limWPSPBCTimeout(tpAniSirGlobal pMac, tpPESession psessionEntry);
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-28 04:36:04 +0000