diff options
| author | Nitesh Shah <niteshs@qti.qualcomm.com> | 2016-06-01 16:37:53 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-06-28 19:55:22 +0530 |
| commit | ef2aff07d12ea5cf90a865cf53554087874ac67c (patch) | |
| tree | 79a3136cf443dfb2548fd29ac33094d373fa73df /CORE/VOSS/src | |
| parent | 5bb4044fa261f6402f2a864d48c6d6b44dadec79 (diff) | |
qcacld-2.0: Clean up the WLAN_FEATURE_MBSSID flag (phase 1)
WLAN_FEATURE_MBSSID flag is originally added to support MBSSID,
specifically for the MOBILE ROUTER build, and is now enabled
for all builds, there is no longer need to have a separate
feature flag, so remove it.
This commit cleans up the following modules - voss/mac/sap/sme.
Change-Id: I79ad9767b7945af0c567b6294ac07e7697898e9e
CRs-fixed: 1023038
Diffstat (limited to 'CORE/VOSS/src')
| -rw-r--r-- | CORE/VOSS/src/vos_api.c | 27 | ||||
| -rw-r--r-- | CORE/VOSS/src/vos_getBin.c | 4 | ||||
| -rw-r--r-- | CORE/VOSS/src/vos_sched.h | 5 |
3 files changed, 1 insertions, 35 deletions
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c index 0ce823314587..b80c021b9499 100644 --- a/CORE/VOSS/src/vos_api.c +++ b/CORE/VOSS/src/vos_api.c @@ -1308,15 +1308,6 @@ v_VOID_t* vos_get_context( VOS_MODULE_ID moduleId, break; } - -#ifndef WLAN_FEATURE_MBSSID - case VOS_MODULE_ID_SAP: - { - pModContext = gpVosContext->pSAPContext; - break; - } -#endif - case VOS_MODULE_ID_HDD: { pModContext = gpVosContext->pHDDContext; @@ -1693,15 +1684,6 @@ VOS_STATUS vos_alloc_context( v_VOID_t *pVosContext, VOS_MODULE_ID moduleID, break; } - -#ifndef WLAN_FEATURE_MBSSID - case VOS_MODULE_ID_SAP: - { - pGpModContext = &(gpVosContext->pSAPContext); - break; - } -#endif - case VOS_MODULE_ID_WDA: { pGpModContext = &(gpVosContext->pWDAContext); @@ -1813,15 +1795,6 @@ VOS_STATUS vos_free_context( v_VOID_t *pVosContext, VOS_MODULE_ID moduleID, break; } - -#ifndef WLAN_FEATURE_MBSSID - case VOS_MODULE_ID_SAP: - { - pGpModContext = &(gpVosContext->pSAPContext); - break; - } -#endif - case VOS_MODULE_ID_WDA: { pGpModContext = &(gpVosContext->pWDAContext); diff --git a/CORE/VOSS/src/vos_getBin.c b/CORE/VOSS/src/vos_getBin.c index 9d8425994292..bb66602726f5 100644 --- a/CORE/VOSS/src/vos_getBin.c +++ b/CORE/VOSS/src/vos_getBin.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -154,7 +154,6 @@ v_BOOL_t vos_concurrent_open_sessions_running(void) return (j>1); } -#ifdef WLAN_FEATURE_MBSSID v_BOOL_t vos_concurrent_beaconing_sessions_running(v_VOID_t) { v_U8_t i=0; @@ -174,7 +173,6 @@ v_BOOL_t vos_concurrent_beaconing_sessions_running(v_VOID_t) return (i>1); } -#endif /**--------------------------------------------------------------------------- diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h index 733da4f60a53..ed39240d99f5 100644 --- a/CORE/VOSS/src/vos_sched.h +++ b/CORE/VOSS/src/vos_sched.h @@ -347,11 +347,6 @@ typedef struct _VosContextType /* MAC Module Context */ v_VOID_t *pMACContext; -#ifndef WLAN_FEATURE_MBSSID - /* SAP Context */ - v_VOID_t *pSAPContext; -#endif - vos_event_t ProbeEvent; volatile v_U8_t isLogpInProgress; |