summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/iwm/if_iwmvar.h2
-rw-r--r--sys/dev/otus/if_otus.c1
-rw-r--r--sys/dev/otus/if_otusreg.h2
-rw-r--r--sys/dev/ral/rt2560var.h4
-rw-r--r--sys/dev/ral/rt2661var.h2
-rw-r--r--sys/dev/ral/rt2860var.h2
-rw-r--r--sys/dev/usb/wlan/if_rsureg.h2
-rw-r--r--sys/dev/usb/wlan/if_runvar.h2
-rw-r--r--sys/dev/usb/wlan/if_uathvar.h2
-rw-r--r--sys/dev/usb/wlan/if_upgtvar.h2
-rw-r--r--sys/dev/usb/wlan/if_uralvar.h3
-rw-r--r--sys/dev/usb/wlan/if_urtwnvar.h5
-rw-r--r--sys/dev/usb/wlan/if_urtwvar.h2
-rw-r--r--sys/dev/usb/wlan/if_zydreg.h2
14 files changed, 2 insertions, 31 deletions
diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h
index ead6904..9434b83 100644
--- 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 2f6d92f..1808c95 100644
--- 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 9f62ebd..4352778 100644
--- 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 12601d8..9d7ed53 100644
--- 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 7ea16f6..93810a6 100644
--- 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 3779e5b..f7fd218 100644
--- 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 ddb29a3..c40f28d 100644
--- 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 3af5b22..aabdaf1 100644
--- 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 4b4d9fc..a38f54f 100644
--- 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 3dcd335..ce996f6 100644
--- 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 5461e87..208a969 100644
--- 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 c825df4..5186b38 100644
--- 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 a423214..08ffc8f 100644
--- 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 ec61d06..86c7ff3 100644
--- 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)
OpenPOWER on IntegriCloud