diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-04 18:49:22 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2016-09-04 18:49:22 +0000 |
| commit | d02e01d3748812514171275a9d8e1e6e2806fb52 (patch) | |
| tree | 000dc0180978c56ade142bd0575543836a510797 /sys/dev/pci/if_iwmvar.h | |
| parent | 3ed7390c658f968bccf33efc8116bafff26a9dd9 (diff) | |
Replace iwm's ioctl tsleep/wakeup BUSY flag dance with an rwlock.
ok tedu
Diffstat (limited to 'sys/dev/pci/if_iwmvar.h')
| -rw-r--r-- | sys/dev/pci/if_iwmvar.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index e2933c927a9..fa79dac72d3 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.20 2016/09/02 15:45:17 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.21 2016/09/04 18:49:21 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -283,8 +283,7 @@ struct iwm_rx_ring { #define IWM_FLAG_HW_INITED 0x02 #define IWM_FLAG_STOPPED 0x04 #define IWM_FLAG_RFKILL 0x08 -#define IWM_FLAG_BUSY 0x10 -#define IWM_FLAG_SCANNING 0x20 +#define IWM_FLAG_SCANNING 0x10 struct iwm_ucode_status { uint32_t uc_error_event_table; @@ -440,6 +439,8 @@ struct iwm_softc { */ int sc_generation; + struct rwlock ioctl_rwl; + int sc_cap_off; /* PCIe caps */ const char *sc_fwname; |