DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WNM: Remove unused age parameter for neighbor comparison

Browse source 
compare_scan_neighbor_results() was taking an age parameter to check
whether the BSS has been seen recently. This was used historically in a
codepath when no new scan was done. However, the logic was changed in
commit 20ed289a78 ("WNM: Clean up old scan data processing") and the
parameter is not used at all anymore as it is replaced by a different
logic. Remove it.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2024-04-29 13:51:46 +02:00 committed by Jouni Malinen
parent 4bbe004e06
commit 582b5eff40
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wpa_supplicant/wnm_sta.c
View file

@ -27,7 +27,6 @@
#define MAX_TFS_IE_LEN 1024 #define MAX_TFS_IE_LEN 1024
#define WNM_MAX_NEIGHBOR_REPORT 10 #define WNM_MAX_NEIGHBOR_REPORT 10
#define WNM_SCAN_RESULT_AGE 2 /* 2 seconds */
/* get the TFS IE from driver */ /* get the TFS IE from driver */
static int ieee80211_11_get_tfs_ie(struct wpa_supplicant *wpa_s, u8 *buf, static int ieee80211_11_get_tfs_ie(struct wpa_supplicant *wpa_s, u8 *buf,
@ -740,7 +739,7 @@ static struct wpa_bss * find_better_target(struct wpa_bss *a,
} }
static struct wpa_bss * static struct wpa_bss *
compare_scan_neighbor_results(struct wpa_supplicant *wpa_s, os_time_t age_secs, compare_scan_neighbor_results(struct wpa_supplicant *wpa_s,
enum mbo_transition_reject_reason *reason) enum mbo_transition_reject_reason *reason)
{ {
u8 i; u8 i;
@ -777,19 +776,6 @@ compare_scan_neighbor_results(struct wpa_supplicant *wpa_s, os_time_t age_secs,
continue; continue;
} }
if (age_secs) {
struct os_reltime now;
if (os_get_reltime(&now) == 0 &&
os_reltime_expired(&now, &target->last_update,
age_secs)) {
wpa_printf(MSG_DEBUG,
"Candidate BSS is more than %ld seconds old",
age_secs);
continue;
}
}
/* /*
* TODO: Could consider allowing transition to another ESS if * TODO: Could consider allowing transition to another ESS if
* PMF was enabled for the association. * PMF was enabled for the association.
@ -1198,7 +1184,7 @@ int wnm_scan_process(struct wpa_supplicant *wpa_s, bool pre_scan_check)
wpa_s->wnm_transition_scan = false; wpa_s->wnm_transition_scan = false;
/* Compare the Neighbor Report and scan results */ /* Compare the Neighbor Report and scan results */
bss = compare_scan_neighbor_results(wpa_s, 0, &reason); bss = compare_scan_neighbor_results(wpa_s, &reason);
/* /*
* If this is a pre-scan check, returning 0 will trigger a scan and * If this is a pre-scan check, returning 0 will trigger a scan and