]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
WNM: Remove unused age parameter for neighbor comparison
authorBenjamin Berg <benjamin.berg@intel.com>
Mon, 29 Apr 2024 11:51:46 +0000 (13:51 +0200)
committerJouni Malinen <j@w1.fi>
Fri, 2 Aug 2024 09:57:34 +0000 (12:57 +0300)
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 20ed289a785c ("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>
wpa_supplicant/wnm_sta.c

index 6c5dafd7a0a7d265413a9ea00771012c69ba4e57..8cd43840059ae324b7238acd807e2bc9fa6105b7 100644 (file)
@@ -27,7 +27,6 @@
 #define MAX_TFS_IE_LEN  1024
 #define WNM_MAX_NEIGHBOR_REPORT 10
 
-#define WNM_SCAN_RESULT_AGE 2 /* 2 seconds */
 
 /* get the TFS IE from driver */
 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 *
-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)
 {
        u8 i;
@@ -777,19 +776,6 @@ compare_scan_neighbor_results(struct wpa_supplicant *wpa_s, os_time_t age_secs,
                        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
                 * 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;
 
        /* 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