diff options
-rw-r--r-- | share/man/man9/ieee80211_radiotap.9 | 9 | ||||
-rw-r--r-- | sys/dev/ic/athnvar.h | 5 | ||||
-rw-r--r-- | sys/dev/ic/athvar.h | 3 | ||||
-rw-r--r-- | sys/dev/ic/rt2860var.h | 5 | ||||
-rw-r--r-- | sys/dev/pci/if_iwmvar.h | 5 | ||||
-rw-r--r-- | sys/dev/pci/if_iwnvar.h | 5 | ||||
-rw-r--r-- | sys/dev/pci/if_iwxvar.h | 5 | ||||
-rw-r--r-- | sys/dev/pci/if_wpivar.h | 5 | ||||
-rw-r--r-- | sys/dev/usb/if_runvar.h | 5 | ||||
-rw-r--r-- | sys/net80211/ieee80211_radiotap.h | 7 |
10 files changed, 19 insertions, 35 deletions
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9 index 6fa35306d53..452b61f6357 100644 --- a/share/man/man9/ieee80211_radiotap.9 +++ b/share/man/man9/ieee80211_radiotap.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ieee80211_radiotap.9,v 1.14 2016/12/11 21:45:06 stsp Exp $ +.\" $OpenBSD: ieee80211_radiotap.9,v 1.15 2020/10/09 08:53:16 mpi Exp $ .\" .\" Copyright (c) 2004 Bruce M. Simpson <bms@spc.org>, .\" Darron Broad <darron@kewl.org>, @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man9/ieee80211_radiotap.9,v 1.3 2004/07/07 12:59:39 ru Exp $ -.\" $Id: ieee80211_radiotap.9,v 1.14 2016/12/11 21:45:06 stsp Exp $ +.\" $Id: ieee80211_radiotap.9,v 1.15 2020/10/09 08:53:16 mpi Exp $ .\" -.Dd $Mdocdate: December 11 2016 $ +.Dd $Mdocdate: October 9 2020 $ .Dt IEEE80211_RADIOTAP 9 .Os .Sh NAME @@ -185,9 +185,6 @@ arbitrary, fixed reference. This field contains a single unsigned 8-bit value, which indicates the RF noise power at the antenna, in decibels difference from an arbitrary, fixed reference. -.It Dv IEEE80211_RADIOTAP_HWQUEUE -This field contains a single unsigned 8-bit value specifying which -hardware queue is being used to transmit the frame. .It Dv IEEE80211_RADIOTAP_RSSI This field contains two unsigned 8-bit values. The first value is the received signal strength index (RSSI) diff --git a/sys/dev/ic/athnvar.h b/sys/dev/ic/athnvar.h index 68fd90a042e..f5a5f2627de 100644 --- a/sys/dev/ic/athnvar.h +++ b/sys/dev/ic/athnvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athnvar.h,v 1.39 2019/02/01 16:15:07 stsp Exp $ */ +/* $OpenBSD: athnvar.h,v 1.40 2020/10/09 08:53:16 mpi Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -69,8 +69,7 @@ struct athn_tx_radiotap_header { #define ATHN_TX_RADIOTAP_PRESENT \ (1 << IEEE80211_RADIOTAP_FLAGS | \ 1 << IEEE80211_RADIOTAP_RATE | \ - 1 << IEEE80211_RADIOTAP_CHANNEL | \ - 1 << IEEE80211_RADIOTAP_HWQUEUE) + 1 << IEEE80211_RADIOTAP_CHANNEL) struct athn_tx_buf { SIMPLEQ_ENTRY(athn_tx_buf) bf_list; diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index 2a3358a733b..8e782e4f3ad 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athvar.h,v 1.33 2020/06/26 19:53:30 cheloha Exp $ */ +/* $OpenBSD: athvar.h,v 1.34 2020/10/09 08:53:16 mpi Exp $ */ /* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */ /*- @@ -149,7 +149,6 @@ struct ath_rx_radiotap_header { (1 << IEEE80211_RADIOTAP_CHANNEL) | \ (1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \ (1 << IEEE80211_RADIOTAP_ANTENNA) | \ - (1 << IEEE80211_RADIOTAP_HWQUEUE) | \ 0) struct ath_tx_radiotap_header { diff --git a/sys/dev/ic/rt2860var.h b/sys/dev/ic/rt2860var.h index 2d6321b06dc..1dc602cfb96 100644 --- a/sys/dev/ic/rt2860var.h +++ b/sys/dev/ic/rt2860var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860var.h,v 1.24 2016/08/17 11:50:52 stsp Exp $ */ +/* $OpenBSD: rt2860var.h,v 1.25 2020/10/09 08:53:16 mpi Exp $ */ /*- * Copyright (c) 2007 @@ -61,8 +61,7 @@ struct rt2860_tx_radiotap_header { #define RT2860_TX_RADIOTAP_PRESENT \ (1 << IEEE80211_RADIOTAP_FLAGS | \ 1 << IEEE80211_RADIOTAP_RATE | \ - 1 << IEEE80211_RADIOTAP_CHANNEL | \ - 1 << IEEE80211_RADIOTAP_HWQUEUE) + 1 << IEEE80211_RADIOTAP_CHANNEL) struct rt2860_tx_data { struct rt2860_txwi *txwi; diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index 89abe2c1dbd..92e78257908 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.55 2020/04/03 08:32:21 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.56 2020/10/09 08:53:16 mpi Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -134,8 +134,7 @@ struct iwm_tx_radiotap_header { #define IWM_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_HWQUEUE)) + (1 << IEEE80211_RADIOTAP_CHANNEL)) #define IWM_UCODE_SECT_MAX 16 #define IWM_FWDMASEGSZ (192*1024) diff --git a/sys/dev/pci/if_iwnvar.h b/sys/dev/pci/if_iwnvar.h index 20991a04e16..876a57767aa 100644 --- a/sys/dev/pci/if_iwnvar.h +++ b/sys/dev/pci/if_iwnvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwnvar.h,v 1.37 2020/04/27 08:02:24 stsp Exp $ */ +/* $OpenBSD: if_iwnvar.h,v 1.38 2020/10/09 08:53:16 mpi Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -48,8 +48,7 @@ struct iwn_tx_radiotap_header { #define IWN_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_HWQUEUE)) + (1 << IEEE80211_RADIOTAP_CHANNEL)) struct iwn_dma_info { bus_dma_tag_t tag; diff --git a/sys/dev/pci/if_iwxvar.h b/sys/dev/pci/if_iwxvar.h index 091ae9711d2..e1f99da5c8b 100644 --- a/sys/dev/pci/if_iwxvar.h +++ b/sys/dev/pci/if_iwxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwxvar.h,v 1.11 2020/08/01 16:14:05 stsp Exp $ */ +/* $OpenBSD: if_iwxvar.h,v 1.12 2020/10/09 08:53:16 mpi Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -122,8 +122,7 @@ struct iwx_tx_radiotap_header { #define IWX_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_HWQUEUE)) + (1 << IEEE80211_RADIOTAP_CHANNEL)) #define IWX_UCODE_SECT_MAX 42 #define IWX_FWDMASEGSZ (192*1024) diff --git a/sys/dev/pci/if_wpivar.h b/sys/dev/pci/if_wpivar.h index 849208b2319..d67c50fe5d2 100644 --- a/sys/dev/pci/if_wpivar.h +++ b/sys/dev/pci/if_wpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpivar.h,v 1.27 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: if_wpivar.h,v 1.28 2020/10/09 08:53:16 mpi Exp $ */ /*- * Copyright (c) 2006-2008 @@ -50,8 +50,7 @@ struct wpi_tx_radiotap_header { #define WPI_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_HWQUEUE)) + (1 << IEEE80211_RADIOTAP_CHANNEL)) struct wpi_dma_info { bus_dma_tag_t tag; diff --git a/sys/dev/usb/if_runvar.h b/sys/dev/usb/if_runvar.h index aad304cee16..83b7d34cabf 100644 --- a/sys/dev/usb/if_runvar.h +++ b/sys/dev/usb/if_runvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_runvar.h,v 1.10 2014/05/24 10:10:17 stsp Exp $ */ +/* $OpenBSD: if_runvar.h,v 1.11 2020/10/09 08:53:16 mpi Exp $ */ /*- * Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr> @@ -70,8 +70,7 @@ struct run_tx_radiotap_header { #define RUN_TX_RADIOTAP_PRESENT \ (1 << IEEE80211_RADIOTAP_FLAGS | \ 1 << IEEE80211_RADIOTAP_RATE | \ - 1 << IEEE80211_RADIOTAP_CHANNEL | \ - 1 << IEEE80211_RADIOTAP_HWQUEUE) + 1 << IEEE80211_RADIOTAP_CHANNEL) struct run_softc; diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index 198219c71d9..5be62abf361 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_radiotap.h,v 1.15 2019/02/19 08:12:30 stsp Exp $ */ +/* $OpenBSD: ieee80211_radiotap.h,v 1.16 2020/10/09 08:53:16 mpi Exp $ */ /* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.3 2004/04/05 22:13:21 sam Exp $ */ /* $NetBSD: ieee80211_radiotap.h,v 1.9 2004/06/06 04:13:28 dyoung Exp $ */ @@ -157,10 +157,6 @@ struct ieee80211_radiotap_header { * * FCS from frame in network byte order. * - * IEEE80211_RADIOTAP_HWQUEUE u_int8_t data - * - * A specific hardware queue (used by WME) - * * IEEE80211_RADIOTAP_RSSI 2x u_int8_t RSSI, max RSSI * * A relative Received Signal Strength Index @@ -181,7 +177,6 @@ enum ieee80211_radiotap_type { IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12, IEEE80211_RADIOTAP_DB_ANTNOISE = 13, IEEE80211_RADIOTAP_FCS = 14, - IEEE80211_RADIOTAP_HWQUEUE = 15, IEEE80211_RADIOTAP_RSSI = 16, IEEE80211_RADIOTAP_EXT = 31 }; |