[haiku-commits] haiku: hrev45435 - src/libs/compat/freebsd_wlan/net80211
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 2 Apr 2013 02:34:36 +0200 (CEST)
hrev45435 adds 1 changeset to branch 'master'
old head: 6e77a76ef949934aa78e71ee52bc34eecd96d987
new head: 1b3dd41a357d759e93ca7512ee429250523cdf82
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1b3dd41+%5E6e77a76
----------------------------------------------------------------------------
1b3dd41: Never join a network if not explicitly configured.
The scanning still occurs so that the network list is populated. But if
no SSID has been explicitly configured, we now always set the
IEEE80211_SCAN_NOJOIN flag that prevents automatically joining open
networks at the end of the scan.
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45435
Commit: 1b3dd41a357d759e93ca7512ee429250523cdf82
URL: http://cgit.haiku-os.org/haiku/commit/?id=1b3dd41
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Tue Apr 2 00:30:04 2013 UTC
----------------------------------------------------------------------------
1 file changed, 9 insertions(+)
src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c | 9 +++++++++
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c
b/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c
index 68a0ea4..9fbeb91 100644
--- a/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c
+++ b/src/libs/compat/freebsd_wlan/net80211/ieee80211_scan.c
@@ -411,6 +411,15 @@ start_scan_locked(const struct ieee80211_scanner *scan,
, flags & IEEE80211_SCAN_ONCE ? ", once" : ""
);
+#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
+
scan_update_locked(vap, scan);
if (ss->ss_ops != NULL) {
if ((flags & IEEE80211_SCAN_NOSSID) == 0)
Other related posts:
- » [haiku-commits] haiku: hrev45435 - src/libs/compat/freebsd_wlan/net80211 - mmlr
