Index: head/sys/dev/iwm/if_iwmvar.h =================================================================== --- head/sys/dev/iwm/if_iwmvar.h +++ head/sys/dev/iwm/if_iwmvar.h @@ -496,14 +496,12 @@ uint8_t pad[IEEE80211_RADIOTAP_HDRLEN]; } sc_rxtapu; #define sc_rxtap sc_rxtapu.th - int sc_rxtap_len; union { struct iwm_tx_radiotap_header th; uint8_t pad[IEEE80211_RADIOTAP_HDRLEN]; } sc_txtapu; #define sc_txtap sc_txtapu.th - int sc_txtap_len; int sc_max_rssi; }; Index: head/sys/dev/otus/if_otus.c =================================================================== --- head/sys/dev/otus/if_otus.c +++ head/sys/dev/otus/if_otus.c @@ -1712,7 +1712,6 @@ break; } mb.m_data = (caddr_t)tap; - mb.m_len = sc->sc_rxtap_len; mb.m_next = m; mb.m_nextpkt = NULL; mb.m_type = 0; Index: head/sys/dev/otus/if_otusreg.h =================================================================== --- head/sys/dev/otus/if_otusreg.h +++ head/sys/dev/otus/if_otusreg.h @@ -1017,14 +1017,12 @@ uint8_t pad[64]; } sc_rxtapu; #define sc_rxtap sc_rxtapu.th - int sc_rxtap_len; union { struct otus_tx_radiotap_header th; uint8_t pad[64]; } sc_txtapu; #define sc_txtap sc_txtapu.th - int sc_txtap_len; }; #endif /* __IF_OTUSREG_H__ */ Index: head/sys/dev/ral/rt2560var.h =================================================================== --- head/sys/dev/ral/rt2560var.h +++ head/sys/dev/ral/rt2560var.h @@ -146,10 +146,8 @@ int nb_ant; struct rt2560_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; - struct rt2560_tx_radiotap_header sc_txtap; - int sc_txtap_len; + #define RT2560_F_INPUT_RUNNING 0x1 #define RT2560_F_RUNNING 0x2 int sc_flags; Index: head/sys/dev/ral/rt2661var.h =================================================================== --- head/sys/dev/ral/rt2661var.h +++ head/sys/dev/ral/rt2661var.h @@ -157,9 +157,7 @@ int dwelltime; struct rt2661_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct rt2661_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; int rt2661_attach(device_t, int); Index: head/sys/dev/ral/rt2860var.h =================================================================== --- head/sys/dev/ral/rt2860var.h +++ head/sys/dev/ral/rt2860var.h @@ -194,9 +194,7 @@ uint32_t txpow40mhz_5ghz[5]; struct rt2860_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct rt2860_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; int rt2860_attach(device_t, int); Index: head/sys/dev/usb/wlan/if_rsureg.h =================================================================== --- head/sys/dev/usb/wlan/if_rsureg.h +++ head/sys/dev/usb/wlan/if_rsureg.h @@ -793,12 +793,10 @@ uint8_t pad[64]; } sc_rxtapu; #define sc_rxtap sc_rxtapu.th - int sc_rxtap_len; union { struct rsu_tx_radiotap_header th; uint8_t pad[64]; } sc_txtapu; #define sc_txtap sc_txtapu.th - int sc_txtap_len; }; Index: head/sys/dev/usb/wlan/if_runvar.h =================================================================== --- head/sys/dev/usb/wlan/if_runvar.h +++ head/sys/dev/usb/wlan/if_runvar.h @@ -253,14 +253,12 @@ uint8_t pad[64]; } sc_rxtapu; #define sc_rxtap sc_rxtapu.th - int sc_rxtap_len; union { struct run_tx_radiotap_header th; uint8_t pad[64]; } sc_txtapu; #define sc_txtap sc_txtapu.th - int sc_txtap_len; }; #define RUN_LOCK(sc) mtx_lock(&(sc)->sc_mtx) Index: head/sys/dev/usb/wlan/if_uathvar.h =================================================================== --- head/sys/dev/usb/wlan/if_uathvar.h +++ head/sys/dev/usb/wlan/if_uathvar.h @@ -230,9 +230,7 @@ #define UATH_FLAG_INITDONE (1 << 2) struct uath_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct uath_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define UATH_LOCK(sc) mtx_lock(&(sc)->sc_mtx) Index: head/sys/dev/usb/wlan/if_upgtvar.h =================================================================== --- head/sys/dev/usb/wlan/if_upgtvar.h +++ head/sys/dev/usb/wlan/if_upgtvar.h @@ -472,9 +472,7 @@ /* BPF */ struct upgt_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct upgt_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define UPGT_LOCK(sc) mtx_lock(&(sc)->sc_mtx) Index: head/sys/dev/usb/wlan/if_uralvar.h =================================================================== --- head/sys/dev/usb/wlan/if_uralvar.h +++ head/sys/dev/usb/wlan/if_uralvar.h @@ -125,10 +125,7 @@ int nb_ant; struct ural_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; - struct ural_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define RAL_LOCK(sc) mtx_lock(&(sc)->sc_mtx) Index: head/sys/dev/usb/wlan/if_urtwnvar.h =================================================================== --- head/sys/dev/usb/wlan/if_urtwnvar.h +++ head/sys/dev/usb/wlan/if_urtwnvar.h @@ -195,12 +195,9 @@ struct usb_xfer *sc_xfer[URTWN_N_TRANSFER]; struct urtwn_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; - struct urtwn_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define URTWN_LOCK(sc) mtx_lock(&(sc)->sc_mtx) #define URTWN_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) -#define URTWN_ASSERT_LOCKED(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) \ No newline at end of file +#define URTWN_ASSERT_LOCKED(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) Index: head/sys/dev/usb/wlan/if_urtwvar.h =================================================================== --- head/sys/dev/usb/wlan/if_urtwvar.h +++ head/sys/dev/usb/wlan/if_urtwvar.h @@ -178,9 +178,7 @@ struct urtw_stats sc_stats; struct urtw_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct urtw_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define URTW_LOCK(sc) mtx_lock(&(sc)->sc_mtx) Index: head/sys/dev/usb/wlan/if_zydreg.h =================================================================== --- head/sys/dev/usb/wlan/if_zydreg.h +++ head/sys/dev/usb/wlan/if_zydreg.h @@ -1304,9 +1304,7 @@ struct zyd_cmd sc_ibuf; struct zyd_rx_radiotap_header sc_rxtap; - int sc_rxtap_len; struct zyd_tx_radiotap_header sc_txtap; - int sc_txtap_len; }; #define ZYD_LOCK(sc) mtx_lock(&(sc)->sc_mtx)