Explorar el Código

qcacld-3.0: Replace CONVERGED_TDLS_ENABLE feature flag

The CONVERGED_TDLS_ENABLE feature flag was originally introduced when
the TDLS feature was being componentized so that one could select
either the legacy implementation or the componentized implementation.
That componentization activity has concluded and the legacy
implementation no longer exists. To align with the current usage
switch to exclusively using the FEATURE_WLAN_TDLS feature flag since
that more accurately describes the code being protected.

Change-Id: I2cdb4c6ddba22c5b1d29e87403e5e1c87ce5cbfe
CRs-Fixed: 2395728
Jeff Johnson hace 6 años
padre
commit
b308fb7565
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 1 1
      cfg/cfg_all.h
  2. 2 2
      tdls/dispatcher/inc/wlan_tdls_ucfg_api.h

+ 1 - 1
cfg/cfg_all.h

@@ -29,7 +29,7 @@
 #define CFG_P2P_ALL
 #endif
 
-#ifdef CONVERGED_TDLS_ENABLE
+#ifdef FEATURE_WLAN_TDLS
 #include "wlan_tdls_cfg.h"
 #else
 #define CFG_TDLS_ALL

+ 2 - 2
tdls/dispatcher/inc/wlan_tdls_ucfg_api.h

@@ -32,7 +32,7 @@
 #include <wlan_objmgr_pdev_obj.h>
 #include <wlan_objmgr_vdev_obj.h>
 
-#ifdef CONVERGED_TDLS_ENABLE
+#ifdef FEATURE_WLAN_TDLS
 
 /**
  * ucfg_tdls_init() - TDLS module initialization API
@@ -313,5 +313,5 @@ QDF_STATUS ucfg_tdls_teardown_links(struct wlan_objmgr_vdev *vdev)
 	return QDF_STATUS_SUCCESS;
 }
 
-#endif /* CONVERGED_TDLS_ENABLE */
+#endif /* FEATURE_WLAN_TDLS */
 #endif