commit 3c3e1789505d14ca7ada1fa09907ed98f0d69d86
author Jeff Johnson <jjohnson@qca.qualcomm.com> Wed Feb 27 10:48:42 2013 -0800
committer Gopichand Nakkala <gnakkala@qca.qualcomm.com> Wed Mar 06 15:16:30 2013 -0800
tree 9b09d95fb598bb5d95da193a2f7ea34be19d6941
parent 88ba77406629a2ac620ab4a9be4aed1ef854da09

wlan: mac: remove obsolete "WLAN_SOFTAP_FEATURE" featurization

The current driver has evolved over time from a driver that originally
only supported "station" mode.  When the initial support for "Soft AP"
mode was added, the code was added with conditional compilation so
that the "Soft AP" 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 "Soft AP" mode.
Therefore remove the conditional compilation since "Soft AP" mode code
must always be present.

CRs-fixed: 452041
Change-Id: Ieb86ce1ff8964672de60be65ef34cf04f15d9348

CORE/MAC/src/pe/lim/limTimerUtils.h

diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index 7f0aa97..ddbea4f 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.h
@@ -67,7 +67,7 @@
     eLIM_ASSOC_FAIL_TIMER,
     eLIM_REASSOC_FAIL_TIMER,
     eLIM_PRE_AUTH_CLEANUP_TIMER,
-    eLIM_HEART_BEAT_TIMER,    
+    eLIM_HEART_BEAT_TIMER,
     eLIM_BACKGROUND_SCAN_TIMER,
 #ifdef ANI_PRODUCT_TYPE_AP
     eLIM_LEARN_INTERVAL_TIMER,
@@ -82,9 +82,7 @@
     eLIM_LEARN_DURATION_TIMER,
     eLIM_QUIET_TIMER,
     eLIM_QUIET_BSS_TIMER,
-#ifdef WLAN_SOFTAP_FEATURE
-    eLIM_WPS_OVERLAP_TIMER, 
-#endif
+    eLIM_WPS_OVERLAP_TIMER,
 #ifdef WLAN_FEATURE_VOWIFI_11R
     eLIM_FT_PREAUTH_RSP_TIMER,
 #endif
@@ -98,7 +96,7 @@
 #ifdef FEATURE_WLAN_TDLS_INTERNAL
     eLIM_TDLS_DISCOVERY_RSP_WAIT,
     eLIM_TDLS_LINK_SETUP_RSP_TIMEOUT,
-    eLIM_TDLS_LINK_SETUP_CNF_TIMEOUT,        
+    eLIM_TDLS_LINK_SETUP_CNF_TIMEOUT,
 #endif
     eLIM_DISASSOC_ACK_TIMER,
     eLIM_DEAUTH_ACK_TIMER,
@@ -127,9 +125,7 @@
 void limDeactivateAndChangePerStaIdTimer(tpAniSirGlobal, tANI_U32, tANI_U16);
 void limActivateCnfTimer(tpAniSirGlobal, tANI_U16, tpPESession);
 void limActivateAuthRspTimer(tpAniSirGlobal, tLimPreAuthNode *);
-#ifdef WLAN_SOFTAP_FEATURE
 void limUpdateOlbcCacheTimerHandler(void *, tANI_U32);
-#endif
 void limAddtsResponseTimerHandler(void *, tANI_U32);
 void limChannelSwitchTimerHandler(void *, tANI_U32);
 void limQuietTimerHandler(void *, tANI_U32);
@@ -156,11 +152,9 @@
  */
 v_UINT_t limActivateHearBeatTimer(tpAniSirGlobal pMac);
 
-#ifdef WLAN_SOFTAP_FEATURE
 #if 0
 void limWPSOverlapTimerHandler(void *pMacGlobal, tANI_U32 param);
 #endif
-#endif
 #ifdef WLAN_ACTIVEMODE_OFFLOAD_FEATURE
 void limMissedBeaconInActiveMode(void *pMacGlobal);
 #endif