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
This commit is contained in:

committed by
nshrivas

parent
9d8154dcd3
commit
e2c9a74022
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user