2fb1fdb1ac
Flag WLAN_FEATURE_NAN_DATAPATH was added to protect NAN Datapath related code, while WLAN_FEATURE_NAN_CONVERGENCE was added to protect the converged code inside NAN Component. Since the original NAN Discovery related code has now been moved inside NAN component and NAN Datapath cannot exist without NAN Discovery, keeping these flags separate doesn't make sense. Combine these two flags with WLAN_FEATURE_NAN flag which is the original NAN feature flag. As a cleanup of NAN code, combine all NAN related flags with WLAN_FEATURE_NAN flag. Change-Id: If98ecaace17f8724e9c28325ef61e721f42e1d8f CRs-Fixed: 2377375
63 rivejä
1.6 KiB
C
63 rivejä
1.6 KiB
C
/*
|
|
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for
|
|
* any purpose with or without fee is hereby granted, provided that the
|
|
* above copyright notice and this permission notice appear in all
|
|
* copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
|
|
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "wlan_policy_mgr_cfg.h"
|
|
#include "cfg_define.h"
|
|
#include "cfg_converged.h"
|
|
#include "cfg_mlme.h"
|
|
#include "cfg_fwol.h"
|
|
#include "cfg_ipa.h"
|
|
|
|
#ifdef CONVERGED_P2P_ENABLE
|
|
#include "wlan_p2p_cfg.h"
|
|
#else
|
|
#define CFG_P2P_ALL
|
|
#endif
|
|
|
|
#ifdef CONVERGED_TDLS_ENABLE
|
|
#include "wlan_tdls_cfg.h"
|
|
#else
|
|
#define CFG_TDLS_ALL
|
|
#endif
|
|
|
|
#ifdef WLAN_FEATURE_NAN
|
|
#include "cfg_nan.h"
|
|
#else
|
|
#define CFG_NAN_ALL
|
|
#endif
|
|
|
|
#include "wlan_pmo_cfg.h"
|
|
#include "hdd_config.h"
|
|
#include "hdd_dp_cfg.h"
|
|
#include "cfg_legacy_dp.h"
|
|
|
|
/* Maintain Alphabetic order here while adding components */
|
|
#define CFG_ALL \
|
|
CFG_CONVERGED_ALL \
|
|
CFG_FWOL_ALL \
|
|
CFG_POLICY_MGR_ALL \
|
|
CFG_HDD_ALL \
|
|
CFG_HDD_DP_ALL \
|
|
CFG_IPA \
|
|
CFG_LEGACY_DP_ALL \
|
|
CFG_MLME_ALL \
|
|
CFG_NAN_ALL \
|
|
CFG_P2P_ALL \
|
|
CFG_PMO_ALL \
|
|
CFG_TDLS_ALL
|