summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2020-10-11 07:05:28 +0000
committermpi <mpi@openbsd.org>2020-10-11 07:05:28 +0000
commit51a6fb1415e6c6a7e23a1a3570ef662a511c3773 (patch)
tree7cde5564787b4414e19ba7dd5ff476d92154c29c /sys/dev/pci
parentAlign pool items on CACHELINESIZE when replacing linux kmem_cache with (diff)
downloadwireguard-openbsd-51a6fb1415e6c6a7e23a1a3570ef662a511c3773.tar.xz
wireguard-openbsd-51a6fb1415e6c6a7e23a1a3570ef662a511c3773.zip
Stop exporting `wt_hwqueue' now that drivers don't advertise it.
Pointed by and ok jsg@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_iwm.c3
-rw-r--r--sys/dev/pci/if_iwmvar.h3
-rw-r--r--sys/dev/pci/if_iwn.c3
-rw-r--r--sys/dev/pci/if_iwnvar.h3
-rw-r--r--sys/dev/pci/if_iwx.c3
-rw-r--r--sys/dev/pci/if_iwxvar.h3
-rw-r--r--sys/dev/pci/if_wpi.c3
-rw-r--r--sys/dev/pci/if_wpivar.h3
8 files changed, 8 insertions, 16 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 40fae2a53d2..c22b90ca348 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.314 2020/08/26 17:12:00 stsp Exp $ */
+/* $OpenBSD: if_iwm.c,v 1.315 2020/10/11 07:05:28 mpi Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -4959,7 +4959,6 @@ iwm_tx(struct iwm_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac)
tap->wt_rate = (0x80 | rinfo->ht_plcp);
} else
tap->wt_rate = rinfo->rate;
- tap->wt_hwqueue = ac;
if ((ic->ic_flags & IEEE80211_F_WEPON) &&
(wh->i_fc[1] & IEEE80211_FC1_PROTECTED))
tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h
index 92e78257908..300a91de418 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.56 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: if_iwmvar.h,v 1.57 2020/10/11 07:05:28 mpi Exp $ */
/*
* Copyright (c) 2014 genua mbh <info@genua.de>
@@ -128,7 +128,6 @@ struct iwm_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define IWM_TX_RADIOTAP_PRESENT \
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 9396c174a9c..bf6dcd04ad6 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.241 2020/07/27 07:24:03 stsp Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.242 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -3465,7 +3465,6 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
tap->wt_rate = (0x80 | ni->ni_txmcs);
} else
tap->wt_rate = rinfo->rate;
- tap->wt_hwqueue = ac;
if ((ic->ic_flags & IEEE80211_F_WEPON) &&
(wh->i_fc[1] & IEEE80211_FC1_PROTECTED))
tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
diff --git a/sys/dev/pci/if_iwnvar.h b/sys/dev/pci/if_iwnvar.h
index 876a57767aa..3af35055a6e 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.38 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: if_iwnvar.h,v 1.39 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -42,7 +42,6 @@ struct iwn_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define IWN_TX_RADIOTAP_PRESENT \
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 458e72f5d2c..5b231404a7d 100644
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwx.c,v 1.44 2020/08/26 17:12:00 stsp Exp $ */
+/* $OpenBSD: if_iwx.c,v 1.45 2020/10/11 07:05:28 mpi Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -4168,7 +4168,6 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac)
tap->wt_rate = (0x80 | rinfo->ht_plcp);
} else
tap->wt_rate = rinfo->rate;
- tap->wt_hwqueue = ac;
if ((ic->ic_flags & IEEE80211_F_WEPON) &&
(wh->i_fc[1] & IEEE80211_FC1_PROTECTED))
tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
diff --git a/sys/dev/pci/if_iwxvar.h b/sys/dev/pci/if_iwxvar.h
index e1f99da5c8b..d17b6abbe17 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.12 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: if_iwxvar.h,v 1.13 2020/10/11 07:05:28 mpi Exp $ */
/*
* Copyright (c) 2014 genua mbh <info@genua.de>
@@ -116,7 +116,6 @@ struct iwx_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define IWX_TX_RADIOTAP_PRESENT \
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index e6708c8106f..f5a4faac978 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.153 2020/07/10 13:22:21 patrick Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.154 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -1701,7 +1701,6 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
tap->wt_chan_freq = htole16(ni->ni_chan->ic_freq);
tap->wt_chan_flags = htole16(ni->ni_chan->ic_flags);
tap->wt_rate = rinfo->rate;
- tap->wt_hwqueue = ac;
if ((ic->ic_flags & IEEE80211_F_WEPON) &&
(wh->i_fc[1] & IEEE80211_FC1_PROTECTED))
tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
diff --git a/sys/dev/pci/if_wpivar.h b/sys/dev/pci/if_wpivar.h
index d67c50fe5d2..602587d0aef 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.28 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: if_wpivar.h,v 1.29 2020/10/11 07:05:29 mpi Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -44,7 +44,6 @@ struct wpi_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define WPI_TX_RADIOTAP_PRESENT \