summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2018-04-29 08:35:28 +0000
committerstsp <stsp@openbsd.org>2018-04-29 08:35:28 +0000
commitcf996fcb46f95c1a640e235d4e9b8581bad433e1 (patch)
tree186dc9195754ee8ce2cc3505e48fd1d3715b1e19
parentCorrect direction of SSL_ERROR_ZERO_RETURN case (diff)
downloadwireguard-openbsd-cf996fcb46f95c1a640e235d4e9b8581bad433e1.tar.xz
wireguard-openbsd-cf996fcb46f95c1a640e235d4e9b8581bad433e1.zip
INIT->RUN transitions are valid in monitor mode, so don't
debug print "invalid transition" to dmesg in this case.
-rw-r--r--sys/net80211/ieee80211_proto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index aac9cfb9464..59076ccdd15 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_proto.c,v 1.85 2018/04/28 14:49:07 stsp Exp $ */
+/* $OpenBSD: ieee80211_proto.c,v 1.86 2018/04/29 08:35:28 stsp Exp $ */
/* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */
/*-
@@ -1075,6 +1075,8 @@ justcleanup:
case IEEE80211_S_RUN:
switch (ostate) {
case IEEE80211_S_INIT:
+ if (ic->ic_opmode == IEEE80211_M_MONITOR)
+ break;
case IEEE80211_S_AUTH:
case IEEE80211_S_RUN:
if (ifp->if_flags & IFF_DEBUG)