net80211 drivers: eliminate any references to sc_rxtap_len/sc_txtap_len (never used...

Submitted by:	<s3erios@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D3776

diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h
index ead69046243835049456af8d551ca95f900debba..9434b838fce1d7a7767d168e53fda48a3ef8a3fe 100644 (file)
--- a/sys/dev/iwm/if_iwmvar.h
+++ b/sys/dev/iwm/if_iwmvar.h
@@ -496,14 +496,12 @@ struct iwm_softc {
                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;
 };

diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c
index 2f6d92fa307e0136b01936ac9600a6939d267962..1808c950c49642c47478363feacb0d09b8c316c4 100644 (file)
--- a/sys/dev/otus/if_otus.c
+++ b/sys/dev/otus/if_otus.c
@@ -1712,7 +1712,6 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, int len, struct mbufq *rxq)
                        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;

diff --git a/sys/dev/otus/if_otusreg.h b/sys/dev/otus/if_otusreg.h
index 9f62ebdbfa536a922bb1c18a1f7ccec25a46cde2..43527782f86719941fc2ffc621b1c975800e405e 100644 (file)
--- a/sys/dev/otus/if_otusreg.h
+++ b/sys/dev/otus/if_otusreg.h
@@ -1017,14 +1017,12 @@ struct otus_softc {
                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__ */

diff --git a/sys/dev/ral/rt2560var.h b/sys/dev/ral/rt2560var.h
index 12601d8ef38bc5b43ea941e0b01179a21f392ba5..9d7ed5394c6c640a8ce1591a642c2ee4451a874e 100644 (file)
--- a/sys/dev/ral/rt2560var.h
+++ b/sys/dev/ral/rt2560var.h
@@ -146,10 +146,8 @@ struct rt2560_softc {
        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;

diff --git a/sys/dev/ral/rt2661var.h b/sys/dev/ral/rt2661var.h
index 7ea16f623d571e5cfa82a3d1f3f5fdafbc43747e..93810a6e110cd3477d10428d2a2da5424d375c9e 100644 (file)
--- a/sys/dev/ral/rt2661var.h
+++ b/sys/dev/ral/rt2661var.h
@@ -157,9 +157,7 @@ struct rt2661_softc {
        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);

diff --git a/sys/dev/ral/rt2860var.h b/sys/dev/ral/rt2860var.h
index 3779e5beb1d15451f44afa95a30347a2456c9df5..f7fd218186a8f4653b3ab224f8f7eda48926fb61 100644 (file)
--- a/sys/dev/ral/rt2860var.h
+++ b/sys/dev/ral/rt2860var.h
@@ -194,9 +194,7 @@ struct rt2860_softc {
        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);

diff --git a/sys/dev/usb/wlan/if_rsureg.h b/sys/dev/usb/wlan/if_rsureg.h
index ddb29a36770ef4a1a96b185be8ada8076a977ff9..c40f28d048345d744a1ae5a3d9e25cb28fcf35be 100644 (file)
--- a/sys/dev/usb/wlan/if_rsureg.h
+++ b/sys/dev/usb/wlan/if_rsureg.h
@@ -793,12 +793,10 @@ struct rsu_softc {
                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;
 };

diff --git a/sys/dev/usb/wlan/if_runvar.h b/sys/dev/usb/wlan/if_runvar.h
index 3af5b22fd68f358c4e0fb4327ecae08082803c81..aabdaf1a4c59ea23431199e83ad325c199b6b065 100644 (file)
--- a/sys/dev/usb/wlan/if_runvar.h
+++ b/sys/dev/usb/wlan/if_runvar.h
@@ -253,14 +253,12 @@ struct run_softc {
                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)

diff --git a/sys/dev/usb/wlan/if_uathvar.h b/sys/dev/usb/wlan/if_uathvar.h
index 4b4d9fc36dc4faccf055ce8095004a3ed4384e14..a38f54fc60b012f1e7ab479f7a0c8acadb69bbd2 100644 (file)
--- a/sys/dev/usb/wlan/if_uathvar.h
+++ b/sys/dev/usb/wlan/if_uathvar.h
@@ -230,9 +230,7 @@ struct uath_softc {
 #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)

diff --git a/sys/dev/usb/wlan/if_upgtvar.h b/sys/dev/usb/wlan/if_upgtvar.h
index 3dcd335aa24857a501a3175b5dfbf9024732494a..ce996f6afc0ba184bd2495dc4a483f7cf0829ea4 100644 (file)
--- a/sys/dev/usb/wlan/if_upgtvar.h
+++ b/sys/dev/usb/wlan/if_upgtvar.h
@@ -472,9 +472,7 @@ struct upgt_softc {
 
        /* 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)

diff --git a/sys/dev/usb/wlan/if_uralvar.h b/sys/dev/usb/wlan/if_uralvar.h
index 5461e87a75c586a79b1245092fc13b32826b072d..208a969ed8c4d3f5c4b62a85b73ef721bb52d606 100644 (file)
--- a/sys/dev/usb/wlan/if_uralvar.h
+++ b/sys/dev/usb/wlan/if_uralvar.h
@@ -125,10 +125,7 @@ struct ural_softc {
        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)

diff --git a/sys/dev/usb/wlan/if_urtwnvar.h b/sys/dev/usb/wlan/if_urtwnvar.h
index c825df4587f6c943eca28c3940665000cfb4e3e8..5186b389c8de91ab5f30a134cbfb380be9cb4bf0 100644 (file)
--- a/sys/dev/usb/wlan/if_urtwnvar.h
+++ b/sys/dev/usb/wlan/if_urtwnvar.h
@@ -195,12 +195,9 @@ struct urtwn_softc {
        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)

diff --git a/sys/dev/usb/wlan/if_urtwvar.h b/sys/dev/usb/wlan/if_urtwvar.h
index a423214de87b54bd37c1d5e8845a854642de02d1..08ffc8f3b303bc593a01816499c030332ecfb0fc 100644 (file)
--- a/sys/dev/usb/wlan/if_urtwvar.h
+++ b/sys/dev/usb/wlan/if_urtwvar.h
@@ -178,9 +178,7 @@ struct urtw_softc {
        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)

diff --git a/sys/dev/usb/wlan/if_zydreg.h b/sys/dev/usb/wlan/if_zydreg.h
index ec61d06434f583ec43793b4ded5347340a0fe47d..86c7ff3ce094bc467170250702e44a7bb2eeac8c 100644 (file)
--- a/sys/dev/usb/wlan/if_zydreg.h
+++ b/sys/dev/usb/wlan/if_zydreg.h
@@ -1304,9 +1304,7 @@ struct zyd_softc {
        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)