summaryrefslogtreecommitdiff
path: root/sys/net80211/ieee80211_input.c
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2018-04-29 12:11:49 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2018-04-29 12:11:49 +0000
commit9c403fcda612d1716147695f8fb8715d65055366 (patch)
tree0ce8f8f4d71e4fd267cd9d9fc889ac3d8305fe88 /sys/net80211/ieee80211_input.c
parent62ce1cca2651c659f32781f7cb9cd8ebf35999c2 (diff)
Don't bother with background scans while the desired BSSID is fixed.
Patch by Jesper Wallin
Diffstat (limited to 'sys/net80211/ieee80211_input.c')
-rw-r--r--sys/net80211/ieee80211_input.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 8b437a8ebae..f7cee805408 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.199 2018/04/27 17:03:09 stsp Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.200 2018/04/29 12:11:48 stsp Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -273,7 +273,8 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni,
if ((*ic->ic_node_checkrssi)(ic, ni))
timeout_del(&ic->ic_bgscan_timeout);
else if (!timeout_pending(&ic->ic_bgscan_timeout) &&
- (ic->ic_flags & IEEE80211_F_BGSCAN) == 0)
+ (ic->ic_flags & IEEE80211_F_BGSCAN) == 0 &&
+ (ic->ic_flags & IEEE80211_F_DESBSSID) == 0)
timeout_add_msec(&ic->ic_bgscan_timeout,
500 * (ic->ic_bgscan_fail + 1));
}