A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Remove unused filter params from scan filter

Browse source 
Remove unused filter params from scan filter. Also
change the type of few, to decrease the memory required.

Change-Id: I3f86d416805174b56c8998f5a4a4723d9ebdd90b
CRs-Fixed: 2723220
This commit is contained in:
Abhishek Singh 2020-07-02 12:51:01 +05:30 • committed by nshrivas
commit 60f7ef7fb1
2 changed files with 10 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

30
umac/scan/core/src/wlan_scan_filter.c
View file

@ -1678,7 +1678,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
int i;
bool match = false;
struct scan_default_params *def_param;
struct wlan_country_ie *cc_ie;
def_param = wlan_scan_psoc_get_def_params(psoc);
if (!def_param)
@ -1688,9 +1687,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
util_scan_entry_age(db_entry))
return false;
if (filter->p2p_results && !db_entry->is_p2p)
return false;
if (db_entry->ssid.length) {
for (i = 0; i < filter->num_of_ssid; i++) {
if (util_is_ssid_match(&filter->ssid_list[i],
@ -1740,8 +1736,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
if (filter->rrm_measurement_filter)
return true;
/* TODO match phyMode */
if (!filter->ignore_auth_enc_type &&
!scm_is_security_match(filter, db_entry, security)) {
scm_debug("%pM : Ignore as security profile didn't match",
@ -1749,23 +1743,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
return false;
}
if (!util_is_bss_type_match(filter->bss_type, db_entry->cap_info)) {
scm_debug("%pM : Ignore as bss type didn't match cap_info %x bss_type %d",
db_entry->bssid.bytes, db_entry->cap_info.value,
filter->bss_type);
return false;
}
/* TODO match rate set */
if (filter->only_wmm_ap &&
!db_entry->ie_list.wmeinfo &&
!db_entry->ie_list.wmeparam) {
scm_debug("%pM : Ignore as required wmeinfo and wme params not present",
db_entry->bssid.bytes);
return false;
}
/* Match realm */
if (!scm_is_fils_config_match(filter, db_entry)) {
scm_debug("%pM :Ignore as fils config didn't match",
@ -1773,13 +1750,6 @@ bool scm_filter_match(struct wlan_objmgr_psoc *psoc,
return false;
}
cc_ie = util_scan_entry_country(db_entry);
if (!util_country_code_match(filter->country, cc_ie)) {
scm_debug("%pM : Ignore as country %.*s didn't match",
db_entry->bssid.bytes, 2, filter->country);
return false;
}
if (!util_mdie_match(filter->mobility_domain,
(struct rsn_mdie *)db_entry->ie_list.mdie)) {
scm_debug("%pM : Ignore as mdie didn't match",

28
umac/scan/dispatcher/inc/wlan_scan_public_structs.h
View file

@ -472,7 +472,6 @@ struct fils_filter_info {
* struct scan_filter: scan filter
* @enable_adaptive_11r: flag to check if adaptive 11r ini is enabled
* @age_threshold: If set return entry which are newer than the age_threshold
* @p2p_results: If only p2p entries is required
* @rrm_measurement_filter: For measurement reports.if set, only SSID, BSSID
* and channel is considered for filtering.
* @num_of_bssid: number of bssid passed
@ -483,17 +482,14 @@ struct fils_filter_info {
* @num_of_mc_enc_type: number of multicast enc type
* @pmf_cap: Pmf capability
* @ignore_pmf_cap: Ignore pmf capability match
* @bss_type: bss type BSS/IBSS etc
* @dot11_mode: operating modes 0 mean any
* 11a , 11g, 11n , 11ac , 11b etc
* @band: to get specific band 2.4G, 5G or 4.9 G
* @rssi_threshold: AP having RSSI greater than
* rssi threasholed (ignored if set 0)
* @only_wmm_ap: If only Qos AP is needed
* @ignore_auth_enc_type: Ignore enc type if
* this is set (For WPS/OSEN connection)
* @mobility_domain: Mobility domain for 11r
* @country[3]: Ap with specific country code
* @bssid_list: bssid list
* @ssid_list: ssid list
* @chan_freq_list: channel frequency list, frequency unit: MHz
@ -511,30 +507,26 @@ struct fils_filter_info {
struct scan_filter {
bool enable_adaptive_11r;
qdf_time_t age_threshold;
uint32_t p2p_results;
uint32_t rrm_measurement_filter;
uint32_t num_of_bssid;
uint32_t num_of_ssid;
uint32_t num_of_channels;
bool rrm_measurement_filter;
uint8_t num_of_bssid;
uint8_t num_of_ssid;
uint8_t num_of_channels;
#ifndef WLAN_SCAN_SECURITY_FILTER_V1
uint32_t num_of_auth;
uint32_t num_of_enc_type;
uint32_t num_of_mc_enc_type;
uint8_t num_of_auth;
uint8_t num_of_enc_type;
uint8_t num_of_mc_enc_type;
#endif
enum wlan_pmf_cap pmf_cap;
bool ignore_pmf_cap;
enum wlan_bss_type bss_type;
enum wlan_phymode dot11_mode;
enum wlan_band band;
uint32_t rssi_threshold;
uint32_t only_wmm_ap;
uint32_t ignore_auth_enc_type;
uint8_t rssi_threshold;
bool ignore_auth_enc_type;
uint32_t mobility_domain;
/* Variable params list */
uint8_t country[3];
struct qdf_mac_addr bssid_list[WLAN_SCAN_FILTER_NUM_BSSID];
struct wlan_ssid ssid_list[WLAN_SCAN_FILTER_NUM_SSID];
uint32_t chan_freq_list[NUM_CHANNELS];
qdf_freq_t chan_freq_list[NUM_CHANNELS];
#ifdef WLAN_SCAN_SECURITY_FILTER_V1
uint32_t authmodeset;
uint32_t key_mgmt;