summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2017-07-16 23:38:36 +0000
committerstsp <stsp@openbsd.org>2017-07-16 23:38:36 +0000
commit0b62475a3a8fc50955a0555eb6198bd7236cc7d8 (patch)
tree50e11b4fb03ee14765c236edd049723973724e5e
parentAdd WITNESS support (diff)
downloadwireguard-openbsd-0b62475a3a8fc50955a0555eb6198bd7236cc7d8.tar.xz
wireguard-openbsd-0b62475a3a8fc50955a0555eb6198bd7236cc7d8.zip
Fix missing splx() in iwm_newstate_task(). Bug introduced 2 hours ago in r1.200.
-rw-r--r--sys/dev/pci/if_iwm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 907e36f99d7..597c898af10 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwm.c,v 1.201 2017/07/16 22:03:11 stsp Exp $ */
+/* $OpenBSD: if_iwm.c,v 1.202 2017/07/16 23:38:36 stsp Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -5851,8 +5851,10 @@ iwm_newstate_task(void *psc)
ieee80211_state_name[ostate],
ieee80211_state_name[nstate]));
- if (nstate == ostate)
+ if (nstate == ostate) {
+ splx(s);
return;
+ }
if (ostate == IEEE80211_S_SCAN)
iwm_led_blink_stop(sc);