Author: avos
Date: Thu Mar 28 09:18:22 2019
New Revision: 345635
URL: https://svnweb.freebsd.org/changeset/base/345635
Log:
MFC r306049:
net80211: remove IEEE80211_RADIOTAP_TSFT field from transmit definitions.
This field may be used for received frames only.
Modified:
stable/11/share/man/man9/ieee80211_radiotap.9
stable/11/sys/dev/ath/if_ath_tx.c
stable/11/sys/dev/ath/if_athioctl.h
stable/11/sys/dev/usb/wlan/if_rum.c
stable/11/sys/dev/usb/wlan/if_rumvar.h
stable/11/sys/dev/usb/wlan/if_run.c
stable/11/sys/dev/usb/wlan/if_runvar.h
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/man/man9/ieee80211_radiotap.9
==============================================================================
--- stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:16:00
2019 (r345634)
+++ stable/11/share/man/man9/ieee80211_radiotap.9 Thu Mar 28 09:18:22
2019 (r345635)
@@ -263,7 +263,6 @@ struct wi_rx_radiotap_header {
and transmit definitions for the Atheros driver:
.Bd -literal -offset indent
#define ATH_TX_RADIOTAP_PRESENT ( \\
- (1 << IEEE80211_RADIOTAP_TSFT) | \\
(1 << IEEE80211_RADIOTAP_FLAGS) | \\
(1 << IEEE80211_RADIOTAP_RATE) | \\
(1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \\
@@ -273,7 +272,6 @@ and transmit definitions for the Atheros driver:
struct ath_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
- uint64_t wt_tsf;
uint8_t wt_flags;
uint8_t wt_rate;
uint8_t wt_txpower;
Modified: stable/11/sys/dev/ath/if_ath_tx.c
==============================================================================
--- stable/11/sys/dev/ath/if_ath_tx.c Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/ath/if_ath_tx.c Thu Mar 28 09:18:22 2019
(r345635)
@@ -1527,7 +1527,6 @@ ath_tx_normal_setup(struct ath_softc *sc, struct ieee8
struct ath_buf *bf, struct mbuf *m0, struct ath_txq *txq)
{
struct ieee80211vap *vap = ni->ni_vap;
- struct ath_hal *ah = sc->sc_ah;
struct ieee80211com *ic = &sc->sc_ic;
const struct chanAccParams *cap = &ic->ic_wme.wme_chanParams;
int error, iswep, ismcast, isfrag, ismrr;
@@ -1783,9 +1782,6 @@ ath_tx_normal_setup(struct ath_softc *sc, struct ieee8
sc->sc_hwmap[rix].ieeerate, -1);
if (ieee80211_radiotap_active_vap(vap)) {
- u_int64_t tsf = ath_hal_gettsf64(ah);
-
- sc->sc_tx_th.wt_tsf = htole64(tsf);
sc->sc_tx_th.wt_flags = sc->sc_hwmap[rix].txflags;
if (iswep)
sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
@@ -2066,7 +2062,6 @@ ath_tx_raw_start(struct ath_softc *sc, struct ieee8021
const struct ieee80211_bpf_params *params)
{
struct ieee80211com *ic = &sc->sc_ic;
- struct ath_hal *ah = sc->sc_ah;
struct ieee80211vap *vap = ni->ni_vap;
int error, ismcast, ismrr;
int keyix, hdrlen, pktlen, try0, txantenna;
@@ -2201,9 +2196,6 @@ ath_tx_raw_start(struct ath_softc *sc, struct ieee8021
sc->sc_hwmap[rix].ieeerate, -1);
if (ieee80211_radiotap_active_vap(vap)) {
- u_int64_t tsf = ath_hal_gettsf64(ah);
-
- sc->sc_tx_th.wt_tsf = htole64(tsf);
sc->sc_tx_th.wt_flags = sc->sc_hwmap[rix].txflags;
if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
Modified: stable/11/sys/dev/ath/if_athioctl.h
==============================================================================
--- stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/ath/if_athioctl.h Thu Mar 28 09:18:22 2019
(r345635)
@@ -374,7 +374,6 @@ struct ath_rx_radiotap_header {
} __packed;
#define ATH_TX_RADIOTAP_PRESENT ( \
- (1 << IEEE80211_RADIOTAP_TSFT) | \
(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \
@@ -384,7 +383,6 @@ struct ath_rx_radiotap_header {
struct ath_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
- u_int64_t wt_tsf;
u_int8_t wt_flags;
u_int8_t wt_rate;
u_int8_t wt_txpower;
Modified: stable/11/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- stable/11/sys/dev/usb/wlan/if_rum.c Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/usb/wlan/if_rum.c Thu Mar 28 09:18:22 2019
(r345635)
@@ -1075,7 +1075,6 @@ tr_setup:
tap->wt_flags = 0;
tap->wt_rate = data->rate;
- rum_get_tsf(sc, &tap->wt_tsf);
tap->wt_antenna = sc->tx_ant;
ieee80211_radiotap_tx(vap, m);
Modified: stable/11/sys/dev/usb/wlan/if_rumvar.h
==============================================================================
--- stable/11/sys/dev/usb/wlan/if_rumvar.h Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/usb/wlan/if_rumvar.h Thu Mar 28 09:18:22 2019
(r345635)
@@ -44,7 +44,6 @@ struct rum_rx_radiotap_header {
struct rum_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
- uint64_t wt_tsf;
uint8_t wt_flags;
uint8_t wt_rate;
uint16_t wt_chan_freq;
@@ -53,8 +52,7 @@ struct rum_tx_radiotap_header {
} __packed __aligned(8);
#define RT2573_TX_RADIOTAP_PRESENT \
- ((1 << IEEE80211_RADIOTAP_TSFT) | \
- (1 << IEEE80211_RADIOTAP_FLAGS) | \
+ ((1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) | \
(1 << IEEE80211_RADIOTAP_ANTENNA))
Modified: stable/11/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/11/sys/dev/usb/wlan/if_run.c Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/usb/wlan/if_run.c Thu Mar 28 09:18:22 2019
(r345635)
@@ -3096,7 +3096,6 @@ tr_setup:
(struct rt2860_txwi *)(&data->desc + sizeof(struct
rt2870_txd));
tap->wt_flags = 0;
tap->wt_rate = rt2860_rates[data->ridx].rate;
- run_get_tsf(sc, &tap->wt_tsf);
tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq);
tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags);
tap->wt_hwqueue = index;
Modified: stable/11/sys/dev/usb/wlan/if_runvar.h
==============================================================================
--- stable/11/sys/dev/usb/wlan/if_runvar.h Thu Mar 28 09:16:00 2019
(r345634)
+++ stable/11/sys/dev/usb/wlan/if_runvar.h Thu Mar 28 09:18:22 2019
(r345635)
@@ -66,7 +66,6 @@ struct run_rx_radiotap_header {
struct run_tx_radiotap_header {
struct ieee80211_radiotap_header wt_ihdr;
- uint64_t wt_tsf;
uint8_t wt_flags;
uint8_t wt_rate;
uint16_t wt_chan_freq;
@@ -77,8 +76,7 @@ struct run_tx_radiotap_header {
#define IEEE80211_RADIOTAP_HWQUEUE 15
#define RUN_TX_RADIOTAP_PRESENT \
- (1 << IEEE80211_RADIOTAP_TSFT | \
- 1 << IEEE80211_RADIOTAP_FLAGS | \
+ (1 << IEEE80211_RADIOTAP_FLAGS | \
1 << IEEE80211_RADIOTAP_RATE | \
1 << IEEE80211_RADIOTAP_CHANNEL | \
1 << IEEE80211_RADIOTAP_HWQUEUE)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
