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

WNM: Define a stub wnm_is_bss_excluded if WNM is disabled

Browse source 
This removes the need to check for CONFIG_WNM.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
This commit is contained in:
Benjamin Berg 2024-02-20 14:18:19 +01:00 committed by Jouni Malinen
parent e164943f43
commit 436f07d02b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/events.c
View file

@ -1692,13 +1692,11 @@ struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
return NULL; return NULL;
} }
#ifdef CONFIG_WNM
if (wnm_is_bss_excluded(wpa_s, bss)) { if (wnm_is_bss_excluded(wpa_s, bss)) {
if (debug_print) if (debug_print)
wpa_dbg(wpa_s, MSG_DEBUG, " skip - BSSID excluded"); wpa_dbg(wpa_s, MSG_DEBUG, " skip - BSSID excluded");
return NULL; return NULL;
} }
#endif /* CONFIG_WNM */
for (ssid = group; ssid; ssid = only_first_ssid ? NULL : ssid->pnext) { for (ssid = group; ssid; ssid = only_first_ssid ? NULL : ssid->pnext) {
if (wpa_scan_res_ok(wpa_s, ssid, match_ssid, match_ssid_len, if (wpa_scan_res_ok(wpa_s, ssid, match_ssid, match_ssid_len,

9
wpa_supplicant/wnm_sta.h
View file

@ -70,7 +70,6 @@ int wnm_send_coloc_intf_report(struct wpa_supplicant *wpa_s, u8 dialog_token,
const struct wpabuf *elems); const struct wpabuf *elems);
void wnm_set_coloc_intf_elems(struct wpa_supplicant *wpa_s, void wnm_set_coloc_intf_elems(struct wpa_supplicant *wpa_s,
struct wpabuf *elems); struct wpabuf *elems);
bool wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss);
int wnm_btm_resp_tx_status(struct wpa_supplicant *wpa_s, const u8 *data, int wnm_btm_resp_tx_status(struct wpa_supplicant *wpa_s, const u8 *data,
size_t data_len); size_t data_len);
@ -80,6 +79,8 @@ int wnm_btm_resp_tx_status(struct wpa_supplicant *wpa_s, const u8 *data,
int wnm_scan_process(struct wpa_supplicant *wpa_s, bool pre_scan_check); int wnm_scan_process(struct wpa_supplicant *wpa_s, bool pre_scan_check);
void wnm_clear_coloc_intf_reporting(struct wpa_supplicant *wpa_s); void wnm_clear_coloc_intf_reporting(struct wpa_supplicant *wpa_s);
bool wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss);
#else /* CONFIG_WNM */ #else /* CONFIG_WNM */
static inline int wnm_scan_process(struct wpa_supplicant *wpa_s, static inline int wnm_scan_process(struct wpa_supplicant *wpa_s,
@ -92,6 +93,12 @@ static inline void wnm_clear_coloc_intf_reporting(struct wpa_supplicant *wpa_s)
{ {
} }
static inline bool
wnm_is_bss_excluded(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
return false;
}
#endif /* CONFIG_WNM */ #endif /* CONFIG_WNM */
#endif /* WNM_STA_H */ #endif /* WNM_STA_H */