Browse Source

qcacmn: Cleanup the scan blacklist path

Currently with the support of Blacklist manager
component, all the blacklist, avoid list, RSSI-REJECT
list is maintained by the BLM, hence the filter logic
of the blacklist APs in the scan component is not
required.

Cleanup the blacklist BSSID APIs, and related functionality

Change-Id: Ic2f282d9ab7d6d30d87d9718a128cbd8446aff4c
CRs-Fixed: 2464191
gaurank kathpalia 5 years ago
parent
commit
5f6876596b

+ 0 - 13
umac/scan/core/src/wlan_scan_filter.c

@@ -1140,7 +1140,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
 {
 	int i;
 	bool match = false;
-	struct roam_filter_params *roam_params;
 	struct scan_default_params *def_param;
 	struct wlan_country_ie *cc_ie;
 
@@ -1148,8 +1147,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
 	if (!def_param)
 		return false;
 
-	roam_params = &def_param->roam_params;
-
 	if (filter->age_threshold && filter->age_threshold <
 					util_scan_entry_age(db_entry))
 		return false;
@@ -1157,16 +1154,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
 	if (filter->p2p_results && !db_entry->is_p2p)
 		return false;
 
-	for (i = 0; i < roam_params->num_bssid_avoid_list; i++) {
-		if (qdf_is_macaddr_equal(&roam_params->bssid_avoid_list[i],
-		   &db_entry->bssid)) {
-			scm_debug("%pM : Ignore as its blacklisted",
-				  db_entry->bssid.bytes);
-			return false;
-		}
-	}
-
-	match = false;
 	if (db_entry->ssid.length) {
 		for (i = 0; i < filter->num_of_ssid; i++) {
 			if (util_is_ssid_match(&filter->ssid_list[i],

+ 0 - 1
umac/scan/core/src/wlan_scan_main.h

@@ -447,7 +447,6 @@ struct scan_default_params {
 		};
 		uint32_t scan_events;
 	};
-	struct roam_filter_params roam_params;
 	struct scoring_config score_config;
 };
 

+ 0 - 18
umac/scan/dispatcher/inc/wlan_scan_public_structs.h

@@ -363,26 +363,8 @@ struct scan_cache_entry {
 };
 
 #define MAX_FAVORED_BSSID 16
-#define MAX_AVOID_LIST_BSSID 16
 #define MAX_ALLOWED_SSID_LIST 4
 
-/**
- * struct roam_filter_params - Structure holding roaming parameters
- * @num_bssid_avoid_list:       The number of BSSID's that we should
- *                              avoid connecting to. It is like a
- *                              blacklist of BSSID's.
- *                              also for roaming apart from the connected one's
- * @bssid_avoid_list:           Blacklist SSID's
- *
- * This structure holds all the key parameters related to
- * initial connection and also roaming connections.
- */
-struct roam_filter_params {
-	uint32_t num_bssid_avoid_list;
-	/* Variable params list */
-	struct qdf_mac_addr bssid_avoid_list[MAX_AVOID_LIST_BSSID];
-};
-
 /**
  * struct weight_config - weight params to calculate best candidate
  * @rssi_weightage: RSSI weightage

+ 0 - 10
umac/scan/dispatcher/inc/wlan_scan_ucfg_api.h

@@ -531,16 +531,6 @@ QDF_STATUS ucfg_scan_register_bcn_cb(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS ucfg_scan_update_user_config(struct wlan_objmgr_psoc *psoc,
 	struct scan_user_cfg *scan_cfg);
 
-/**
- * ucfg_scan_update_roam_params() - Store/Update the roam params
- * @psoc: psoc
- * @roam_params: roam params
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS ucfg_scan_update_roam_params(struct wlan_objmgr_psoc *psoc,
-	struct roam_filter_params *roam_params);
-
 /*
  * ucfg_scan_init() - Scan module initialization API
  *

+ 0 - 21
umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

@@ -1507,27 +1507,6 @@ QDF_STATUS ucfg_scan_update_user_config(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
-QDF_STATUS ucfg_scan_update_roam_params(struct wlan_objmgr_psoc *psoc,
-	struct roam_filter_params *roam_params)
-{
-	struct scan_default_params *scan_def;
-
-	if (!psoc) {
-		scm_err("null psoc");
-		return QDF_STATUS_E_FAILURE;
-	}
-	scan_def = wlan_scan_psoc_get_def_params(psoc);
-	if (!scan_def) {
-		scm_err("Failed to get scan object");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	qdf_mem_copy(&scan_def->roam_params, roam_params,
-		sizeof(struct roam_filter_params));
-
-	return QDF_STATUS_SUCCESS;
-}
-
 #ifdef WLAN_POWER_MANAGEMENT_OFFLOAD
 static QDF_STATUS
 ucfg_scan_cancel_pdev_scan(struct wlan_objmgr_pdev *pdev)