Merge "qca-wifi: Add mac filtering support for connection manager"

umac/mlme/conn_mgr/core/src/wlan_cm_blm_main.c

@@ -17,7 +17,6 @@
 /**
  * DOC: Implement APIs related to the Blacklist manager
  */
-#if 0
 #include <wlan_objmgr_cmn.h>
 #include <wlan_objmgr_pdev_obj.h>
 #include <wlan_scan_utils_api.h>
@@ -124,4 +123,3 @@ wlan_blacklist_action_on_bssid(struct wlan_objmgr_pdev *pdev,
 
 	return CM_BLM_NO_ACTION;
 }
-#endif

umac/mlme/conn_mgr/core/src/wlan_cm_blm_main.h

@@ -20,7 +20,6 @@
 
 #ifndef _WLAN_CM_BLM_MAIN_H_
 #define _WLAN_CM_BLM_MAIN_H_
-#if 0
 #include <wlan_scan_public_structs.h>
 
 /**
@@ -35,4 +34,3 @@ struct blm_entry_iter_obj {
 	bool match;
 };
 #endif
-#endif

umac/mlme/conn_mgr/dispatcher/inc/wlan_cm_blm.h

@@ -20,7 +20,6 @@
 
 #ifndef _WLAN_CM_BLM_H_
 #define _WLAN_CM_BLM_H_
-#if 0
 #include <wlan_scan_utils_api.h>
 
 /*
@@ -88,4 +87,3 @@ enum cm_blm_exc_mac_mode wlan_cm_get_exc_mac_addr_list(
  */
 qdf_time_t wlan_cm_get_bad_ap_timeout(struct wlan_objmgr_vdev *vdev);
 #endif
-#endif