tree acc20e3156b290df773e4c3bb3a838df791e60b6
parent 8064f01cb57ba09f23c7d67899f0c468a43fdcf5
author Nachiket Kukade <nkukade@codeaurora.org> 1546941927 +0530
committer nshrivas <nshrivas@codeaurora.org> 1549305870 -0800

qcacld-3.0: Combine all NAN related flags with WLAN_FEATURE_NAN

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