wlan: Remove obsolete LIM_TIMER_EXPIRY_LIST support
The wlan code has support for a LIM_TIMER_EXPIRY_LIST that has been
compiled out for many generations of the code. Remove this obsolete
code.
Change-Id: Id0d391bc5b4dbd748f7bdb03e3732df486454b77
CRs-fixed: 452041
diff --git a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c b/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
index 87ffbf3..7552b6a 100644
--- a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
@@ -40,7 +40,6 @@
*/
/*
- *
* Airgo Networks, Inc proprietary. All rights reserved.
* This file limProcessLmmMessages.cc contains the code
* for processing SME/LMM messages related to ANI feature set.
@@ -198,12 +197,6 @@
pMac->lim.gLimMeasParams.isMeasIndTimerActive = 0;
PELOG3(limLog(pMac, LOG3, FL("MeasurementIndication timer initialized, period = %d\n"),
pMac->lim.gpLimMeasReq->measIndPeriod);)
-
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.gLimMeasParams.measurementIndTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
}
tANI_U32 learnInterval =
@@ -224,12 +217,6 @@
return eSIR_SYS_TX_TIMER_CREATE_FAILED;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.gLimMeasParams.learnIntervalTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
-
val = SYS_MS_TO_TICKS(pMac->lim.gpLimMeasReq->measDuration.shortChannelScanDuration);
if (tx_timer_create(
&pMac->lim.gLimMeasParams.learnDurationTimer,
@@ -248,48 +235,29 @@
return eSIR_SYS_TX_TIMER_CREATE_FAILED;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.gLimMeasParams.learnDurationTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
-
- #if 0
- if (wlan_cfgGetInt(pMac, WNI_CFG_BEACON_INTERVAL, &beaconInterval) != eSIR_SUCCESS)
- {
- limLog(pMac, LOGP, FL("Can't read beacon interval\n"));
- return eSIR_FAILURE;
- }
- #endif // TO SUPPORT BT-AMP
-
- /* Copy the beacon interval from the sessio Id */
- beaconInterval = psessionEntry->beaconParams.beaconInterval;
+ /* Copy the beacon interval from the session Id */
+ beaconInterval = psessionEntry->beaconParams.beaconInterval;
if ((learnInterval > ( 2 * beaconInterval)) &&
(pMac->lim.gLimSystemRole == eLIM_AP_ROLE))
{
//learinterval should be > 2 * beaconinterval
val = SYS_MS_TO_TICKS(learnInterval - (2 * beaconInterval));
- // Create Quiet BSS Timer
- if( TX_SUCCESS !=
- tx_timer_create( &pMac->lim.limTimers.gLimQuietBssTimer,
- "QUIET BSS TIMER",
- limQuietBssTimerHandler,
- SIR_LIM_QUIET_BSS_TIMEOUT,
- val, // initial_ticks
- 0, // reschedule_ticks
- TX_NO_ACTIVATE ))
- {
- limLog( pMac, LOGP,
- FL( "Failed to create gLimQuietBssTimer!\n" ));
- return eSIR_SYS_TX_TIMER_CREATE_FAILED;
- }
+ // Create Quiet BSS Timer
+ if ( TX_SUCCESS !=
+ tx_timer_create( &pMac->lim.limTimers.gLimQuietBssTimer,
+ "QUIET BSS TIMER",
+ limQuietBssTimerHandler,
+ SIR_LIM_QUIET_BSS_TIMEOUT,
+ val, // initial_ticks
+ 0, // reschedule_ticks
+ TX_NO_ACTIVATE ))
+ {
+ limLog( pMac, LOGP,
+ FL( "Failed to create gLimQuietBssTimer!" ));
+ return eSIR_SYS_TX_TIMER_CREATE_FAILED;
+ }
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.limTimers.gLimQuietBssTimer,
- LIM_TIMER_EXPIRY_LIST );
-#endif
pMac->lim.gLimSpecMgmt.fQuietEnabled = eANI_BOOLEAN_TRUE;
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index fe40bd7..65e8b75 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file lim ProcessMessageQueue.cc contains the code
@@ -264,17 +263,6 @@
return;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- ULONG param;
- while(get_timer_event(LIM_TIMER_EXPIRY_LIST,¶m))
- {
- limMsg.type = (tANI_U16) param;
- limMsg.bodyval = 0;
- limMsg.bodyptr = NULL;
- limMessageProcessor(pMac, &limMsg);
- }
-#endif
-
if (tx_queue_receive( &pMac->sys.gSirLimMsgQ, (void *) &limMsg, TX_WAIT_FOREVER)
== TX_SUCCESS)
{
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index 22f24ba..3386c1a 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -248,11 +248,6 @@
return;
}
-
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(&pMac->lim.limTimers.gLimPreAuthClnupTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
PELOG1(limLog(pMac, LOG1,
FL("Created pre-auth cleanup timer\n"));)
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index 837db65..a54ca44 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -38,7 +38,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-
/*
* Airgo Networks, Inc proprietary. All rights reserved.
* This file limTimerUtils.cc contains the utility functions
@@ -123,11 +122,6 @@
limLog(pMac, LOGP, FL("could not create MIN channel timer\n"));
return TX_TIMER_ERROR;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.limTimers.gLimMinChannelTimer, LIM_TIMER_EXPIRY_LIST);
-#endif
-
PELOG2(limLog(pMac, LOG2, FL("Created MinChannelTimer\n"));)
/* Periodic probe request timer value is half of the Min channel
@@ -177,12 +171,6 @@
goto err_timer;
}
-
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.limTimers.gLimMaxChannelTimer, LIM_TIMER_EXPIRY_LIST);
-#endif
-
PELOG2(limLog(pMac, LOG2, FL("Created MaxChannelTimer\n"));)
if (pMac->lim.gLimSystemRole != eLIM_AP_ROLE)
@@ -274,10 +262,6 @@
limLog(pMac, LOGP, FL("could not create Periodic Join Probe Request timer\n"));
goto err_timer;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(&pMac->lim.limTimers.gLimJoinFailureTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
if (wlan_cfgGetInt(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT,
&cfgValue) != eSIR_SUCCESS)
@@ -378,10 +362,7 @@
goto err_timer;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(&pMac->lim.limTimers.gLimAuthFailureTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
+
if (wlan_cfgGetInt(pMac, WNI_CFG_BEACON_INTERVAL,
&cfgValue) != eSIR_SUCCESS)
{
@@ -438,11 +419,6 @@
goto err_timer;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(&pMac->lim.limTimers.gLimProbeAfterHBTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
-
#if defined(ANI_PRODUCT_TYPE_CLIENT) || defined(ANI_AP_CLIENT_SDK)
if (wlan_cfgGetInt(pMac, WNI_CFG_BACKGROUND_SCAN_PERIOD,
&cfgValue) != eSIR_SUCCESS)
@@ -539,11 +515,6 @@
FL("create Disassociate throttle timer failed\n"));
goto err_timer;
}
-#if defined(ANI_OS_TYPE_RTAI_LINUX)
- tx_timer_set_expiry_list(
- &pMac->lim.limTimers.gLimSendDisassocFrameThresholdTimer,
- LIM_TIMER_EXPIRY_LIST);
-#endif
PELOG1(limLog(pMac, LOG1,
FL("Created Disassociate throttle timer \n"));)