summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2017-05-28 09:59:59 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2017-05-28 09:59:59 +0000
commit4e90dddc9c28fbc28a5d535cc182135fc52a97a7 (patch)
tree0bda8b93aef0b0f21737ac739905b352888d9d5d /sys
parent7e965b0d5ac1a5217dd8116b427b7f8fd1bca095 (diff)
Remove unused flag IWM_FLAG_STOPPED.
ok tedu@ of course
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_iwm.c4
-rw-r--r--sys/dev/pci/if_iwmvar.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index dd6479945f2..ef68a5211a7 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.182 2017/05/26 18:40:05 stsp Exp $ */
+/* $OpenBSD: if_iwm.c,v 1.183 2017/05/28 09:59:58 stsp Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -6052,7 +6052,6 @@ iwm_init(struct ifnet *ifp)
return 0;
}
sc->sc_generation++;
- sc->sc_flags &= ~IWM_FLAG_STOPPED;
err = iwm_init_hw(sc);
if (err) {
@@ -6144,7 +6143,6 @@ iwm_stop(struct ifnet *ifp, int disable)
struct iwm_node *in = (void *)ic->ic_bss;
sc->sc_flags &= ~IWM_FLAG_HW_INITED;
- sc->sc_flags |= IWM_FLAG_STOPPED;
sc->sc_generation++;
ic->ic_scan_lock = IEEE80211_SCAN_UNLOCKED;
ifp->if_flags &= ~IFF_RUNNING;
diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h
index cf555e66088..a78c5eddd32 100644
--- a/sys/dev/pci/if_iwmvar.h
+++ b/sys/dev/pci/if_iwmvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwmvar.h,v 1.26 2017/05/08 13:07:40 stsp Exp $ */
+/* $OpenBSD: if_iwmvar.h,v 1.27 2017/05/28 09:59:58 stsp Exp $ */
/*
* Copyright (c) 2014 genua mbh <info@genua.de>
@@ -281,9 +281,8 @@ struct iwm_rx_ring {
#define IWM_FLAG_USE_ICT 0x01
#define IWM_FLAG_HW_INITED 0x02
-#define IWM_FLAG_STOPPED 0x04
-#define IWM_FLAG_RFKILL 0x08
-#define IWM_FLAG_SCANNING 0x10
+#define IWM_FLAG_RFKILL 0x04
+#define IWM_FLAG_SCANNING 0x08
struct iwm_ucode_status {
uint32_t uc_error_event_table;