diff options
author | Peter Hessler <phessler@cvs.openbsd.org> | 2018-07-16 12:42:23 +0000 |
---|---|---|
committer | Peter Hessler <phessler@cvs.openbsd.org> | 2018-07-16 12:42:23 +0000 |
commit | 0da7d4bc120fe64fdbbc90778507243b903301a6 (patch) | |
tree | f8d5b677b83d37aea13f97d9171bcba29a51bbb3 | |
parent | 8d149c777e7a723fc24fdbe40fe22f449a2f34a2 (diff) |
the AP sends their crypto parameters as a mask, so let us still select it
in case we want WPA2 and they have WPA1 still enabled
-rw-r--r-- | sys/net80211/ieee80211_node.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 48b861870d1..738aa6c36fb 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.c,v 1.132 2018/07/16 12:34:14 phessler Exp $ */ +/* $OpenBSD: ieee80211_node.c,v 1.133 2018/07/16 12:42:22 phessler Exp $ */ /* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */ /*- @@ -388,13 +388,11 @@ ieee80211_match_ess(struct ieee80211com *ic) continue; } - if (ess->rsnprotos != ni->ni_rsnprotos) + if ((ess->rsnprotos & ni->ni_rsnprotos) == 0) continue; - if (ess->rsnakms != ni->ni_rsnakms) + if ((ess->rsnakms & ni->ni_rsnakms) == 0) continue; - if (ess->rsngroupcipher != ni->ni_rsngroupcipher) - continue; - if (ess->rsnciphers != ni->ni_rsnciphers) + if ((ess->rsnciphers & ni->ni_rsnciphers) == 0) continue; if ((ic->ic_flags & IEEE80211_F_DESBSSID) && |