From 1f47d9a206e37fa20894bfdd0978dbcd38fe34de Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 8 Aug 2026 12:39:23 -0400 Subject: [PATCH] freebsd_wlan: Reinstate the IEEE80211_SCAN_NOJOIN flag set. It was accidentally lost in e67600e2a4a59a6097984adf91ad397c75344e16. (cherry picked from commit 9f618d40ff38a8128d4b621d1923cb0882503474) Change-Id: I6ba6acfb1f25825d630e700828af3f6910f23ae5 Reviewed-on: https://review.haiku-os.org/c/haiku/+/11494 Reviewed-by: waddlesplash --- src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c b/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c index 0066ac4fbc..fd3d4ca29b 100644 --- a/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c +++ b/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c @@ -389,6 +389,15 @@ ieee80211_check_scan(struct ieee80211vap *vap, int flags, flags |= IEEE80211_SCAN_FLUSH; } +#ifdef __HAIKU__ + /* We never want to join if not explicitly looking for an SSID */ + if (nssid == 0 && (flags & IEEE80211_SCAN_NOJOIN) == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: setting nojoin due to no configured ssid\n", __func__); + flags |= IEEE80211_SCAN_NOJOIN; + } +#endif + /* * XXX TODO: separate things out a bit better. */