From e2c9a74022340f77d87ab4000fe6731a3cc47686 Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Tue, 8 Jan 2019 16:21:04 +0530 Subject: [PATCH] qcacmn: Combine all NAN related flags with WLAN_FEATURE_NAN Flag WLAN_FEATURE_NAN_CONVERGENCE was added to protect the converged NAN code inside NAN Component. Since the original NAN Discovery related code has now been moved inside NAN component, keeping this flag separate doesn't make sense. Combine this flag with WLAN_FEATURE_NAN flag which is the original NAN feature flag. Change-Id: I0045dcccd36524cbcd4253347c9e0a5704193c2b CRs-Fixed: 2377393 --- wmi/inc/wmi_unified_api.h | 2 +- wmi/inc/wmi_unified_priv.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 7ead32974a..a009effc8f 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -82,7 +82,7 @@ #include "wmi_unified_ocb_api.h" #endif -#ifdef WLAN_FEATURE_NAN_CONVERGENCE +#ifdef WLAN_FEATURE_NAN #include "wmi_unified_nan_api.h" #endif diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index be4052d8d7..e495feddfa 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -40,7 +40,7 @@ #include "wlan_green_ap_api.h" #endif -#ifdef WLAN_FEATURE_NAN_CONVERGENCE +#ifdef WLAN_FEATURE_NAN #include "nan_public_structs.h" #endif @@ -1745,7 +1745,7 @@ QDF_STATUS (*extract_wds_entry)(wmi_unified_t wmi_handle, struct wdsentry *wds_entry, u_int32_t idx); -#ifdef WLAN_FEATURE_NAN_CONVERGENCE +#ifdef WLAN_FEATURE_NAN QDF_STATUS (*send_ndp_initiator_req_cmd)(wmi_unified_t wmi_handle, struct nan_datapath_initiator_req *req); QDF_STATUS (*send_ndp_responder_req_cmd)(wmi_unified_t wmi_handle, @@ -1767,7 +1767,7 @@ QDF_STATUS (*extract_ndp_end_ind)(wmi_unified_t wmi_handle, uint8_t *data, struct nan_datapath_end_indication_event **ind); QDF_STATUS (*extract_ndp_sch_update)(wmi_unified_t wmi_handle, uint8_t *data, struct nan_datapath_sch_update_event *ind); -#endif /* WLAN_FEATURE_NAN_CONVERGENCE */ +#endif /* WLAN_FEATURE_NAN */ QDF_STATUS (*send_obss_detection_cfg_cmd)(wmi_unified_t wmi_handle, struct wmi_obss_detection_cfg_param *obss_cfg_param); @@ -2093,7 +2093,7 @@ static inline void wmi_ocb_attach_tlv(wmi_unified_t wmi_handle) } #endif -#ifdef WLAN_FEATURE_NAN_CONVERGENCE +#ifdef WLAN_FEATURE_NAN void wmi_nan_attach_tlv(wmi_unified_t wmi_handle); #else static inline void wmi_nan_attach_tlv(wmi_unified_t wmi_handle)