summaryrefslogtreecommitdiffstats
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
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@
-rw-r--r--sys/dev/ic/ar5008.c3
-rw-r--r--sys/dev/ic/ar9003.c3
-rw-r--r--sys/dev/ic/ath.c3
-rw-r--r--sys/dev/ic/athnvar.h3
-rw-r--r--sys/dev/ic/athvar.h3
-rw-r--r--sys/dev/ic/rt2860.c3
-rw-r--r--sys/dev/ic/rt2860var.h3
-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
-rw-r--r--sys/dev/usb/if_run.c3
-rw-r--r--sys/dev/usb/if_runvar.h3
17 files changed, 17 insertions, 34 deletions
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index 826eb04783b..560db09a447 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5008.c,v 1.61 2020/07/13 08:31:32 stsp Exp $ */
+/* $OpenBSD: ar5008.c,v 1.62 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -1522,7 +1522,6 @@ ar5008_tx(struct athn_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
tap->wt_rate = athn_rates[ridx[0]].rate;
tap->wt_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq);
tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags);
- tap->wt_hwqueue = qid;
if (athn_rates[ridx[0]].phy == IEEE80211_T_DS &&
ridx[0] != ATHN_RIDX_CCK1 &&
(ic->ic_flags & IEEE80211_F_SHPREAMBLE))
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index ebe08ff66a7..71e00a29678 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar9003.c,v 1.50 2020/02/17 20:57:58 claudio Exp $ */
+/* $OpenBSD: ar9003.c,v 1.51 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1483,7 +1483,6 @@ ar9003_tx(struct athn_softc *sc, struct mbuf *m, struct ieee80211_node *ni,
tap->wt_rate = athn_rates[ridx[0]].rate;
tap->wt_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq);
tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags);
- tap->wt_hwqueue = qid;
if (athn_rates[ridx[0]].phy == IEEE80211_T_DS &&
ridx[0] != ATHN_RIDX_CCK1 &&
(ic->ic_flags & IEEE80211_F_SHPREAMBLE))
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index bac05281930..9a640630ecd 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.121 2020/07/10 13:26:37 patrick Exp $ */
+/* $OpenBSD: ath.c,v 1.122 2020/10/11 07:05:28 mpi Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -2309,7 +2309,6 @@ ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni,
IEEE80211_RATE_VAL;
sc->sc_txtap.wt_txpower = 30;
sc->sc_txtap.wt_antenna = antenna;
- sc->sc_txtap.wt_hwqueue = hwqueue;
bpf_mtap_hdr(sc->sc_drvbpf, &sc->sc_txtap, sc->sc_txtap_len,
m0, BPF_DIRECTION_OUT);
diff --git a/sys/dev/ic/athnvar.h b/sys/dev/ic/athnvar.h
index f5a5f2627de..c21c6979441 100644
--- a/sys/dev/ic/athnvar.h
+++ b/sys/dev/ic/athnvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: athnvar.h,v 1.40 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: athnvar.h,v 1.41 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -63,7 +63,6 @@ struct athn_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define ATHN_TX_RADIOTAP_PRESENT \
diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h
index 8e782e4f3ad..c8924557629 100644
--- a/sys/dev/ic/athvar.h
+++ b/sys/dev/ic/athvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: athvar.h,v 1.34 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: athvar.h,v 1.35 2020/10/11 07:05:28 mpi Exp $ */
/* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */
/*-
@@ -159,7 +159,6 @@ struct ath_tx_radiotap_header {
u_int16_t wt_chan_flags;
u_int8_t wt_txpower;
u_int8_t wt_antenna;
- u_int8_t wt_hwqueue;
} __packed;
/*
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index fa9b12e7275..60c14b5eb53 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860.c,v 1.99 2020/07/10 13:22:20 patrick Exp $ */
+/* $OpenBSD: rt2860.c,v 1.100 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1644,7 +1644,6 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
tap->wt_rate = rt2860_rates[ridx].rate;
tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq);
tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags);
- tap->wt_hwqueue = qid;
if (mcs & RT2860_PHY_SHPRE)
tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
diff --git a/sys/dev/ic/rt2860var.h b/sys/dev/ic/rt2860var.h
index 1dc602cfb96..ba0625fd0ce 100644
--- a/sys/dev/ic/rt2860var.h
+++ b/sys/dev/ic/rt2860var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860var.h,v 1.25 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: rt2860var.h,v 1.26 2020/10/11 07:05:28 mpi Exp $ */
/*-
* Copyright (c) 2007
@@ -55,7 +55,6 @@ struct rt2860_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define RT2860_TX_RADIOTAP_PRESENT \
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 \
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 122113f60a7..88f43df30dc 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_run.c,v 1.130 2020/07/31 10:49:32 mglocker Exp $ */
+/* $OpenBSD: if_run.c,v 1.131 2020/10/11 07:05:29 mpi Exp $ */
/*-
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2485,7 +2485,6 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
tap->wt_rate = rt2860_rates[ridx].rate;
tap->wt_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq);
tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags);
- tap->wt_hwqueue = qid;
if (mcs & RT2860_PHY_SHPRE)
tap->wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
diff --git a/sys/dev/usb/if_runvar.h b/sys/dev/usb/if_runvar.h
index 83b7d34cabf..755f0eb2df9 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.11 2020/10/09 08:53:16 mpi Exp $ */
+/* $OpenBSD: if_runvar.h,v 1.12 2020/10/11 07:05:29 mpi Exp $ */
/*-
* Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -64,7 +64,6 @@ struct run_tx_radiotap_header {
uint8_t wt_rate;
uint16_t wt_chan_freq;
uint16_t wt_chan_flags;
- uint8_t wt_hwqueue;
} __packed;
#define RUN_TX_RADIOTAP_PRESENT \