Ticket #898: madwifi_monitor_tx_rate_antenna_tsf.patch

net80211/ieee80211_monitor.c

@@ -206 +206 @@
- */
-void
-ieee80211_input_monitor(struct ieee80211com *ic, struct sk_buff *skb,
-32
+64
-{
-        struct ieee80211vap *vap, *next;
-        int noise = 0;
@@ -267 +267 @@
-                        ph->hosttime.status = 0;
-                        ph->hosttime.len = 4;
-                        ph->hosttime.data = jiffies;
+                        
-                        /* Pass up tsf clock in mactime */
+                        /* NB: the prism mactime field is 32bit, so we lose TSF precision here */
-                        ph->mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;
-                        ph->mactime.status = 0;
-                        ph->mactime.len = 4;
@@ -308 +310 @@
-                        ph->rate.did = DIDmsg_lnxind_wlansniffrm_rate;
-                        ph->rate.status = 0;
-                        ph->rate.len = 4;
-
+
+
+
+
-                        break;
-                }
-                case ARPHRD_IEEE80211_RADIOTAP: {
@@ -327 +332 @@
-                                th->wt_ihdr.it_version = 0;
-                                th->wt_ihdr.it_len = cpu_to_le16(sizeof(struct ath_tx_radiotap_header));
-                                th->wt_ihdr.it_present = cpu_to_le32(ATH_TX_RADIOTAP_PRESENT);
+
+                                /* radiotap's TSF field is the full 64 bits, so we don't lose
+                                 * any TSF precision when using radiotap */
+                                memcpy(&th->wt_tsft, &mactime, IEEE80211_TSF_LEN);
+                                th->wt_tsft = cpu_to_le64(th->wt_tsft);
+                        
-                                th->wt_flags = 0;
-rxstat.r
+txstat.t
-                                th->wt_txpower = 0;
-0
+ds->ds_txstat.ts_antenna
-                        } else {
-                                struct ath_rx_radiotap_header *th;
-                                if (skb_headroom(skb1) < sizeof(struct ath_rx_radiotap_header)) {

net80211/ieee80211_monitor.h

@@ -135 +135 @@
-}__attribute__((__packed__));
-
-#define ATH_TX_RADIOTAP_PRESENT (               \
+        (1 << IEEE80211_RADIOTAP_TSFT)          | \
-        (1 << IEEE80211_RADIOTAP_FLAGS)         | \
-        (1 << IEEE80211_RADIOTAP_RATE)          | \
-        (1 << IEEE80211_RADIOTAP_DBM_TX_POWER)  | \
@@ -143 +144 @@
-
-struct ath_tx_radiotap_header {
-        struct ieee80211_radiotap_header wt_ihdr;
-
+
+
-        u_int8_t wt_rate;
-        u_int8_t wt_txpower;
-        u_int8_t wt_antenna;
@@ -154 +156 @@
- * to have space at the front to push a wlan_ng_prims2_header.
- */
-void ieee80211_input_monitor(struct ieee80211com *, struct sk_buff *,
-32
+64
-
-
-void ieee80211_monitor_encap(struct ieee80211vap *, struct sk_buff *);

ath/if_ath.c

@@ -5195 +5195 @@
-}
-
-/*
+ * Extend 15-bit time stamp from rx descriptor to
+ * a full 64-bit TSF using the current h/w TSF.
+ */
+static __inline u_int64_t
+ath_extend_tsf(struct ath_hal *ah, u_int32_t rstamp)
+{
+        u_int64_t tsf;
+
+        tsf = ath_hal_gettsf64(ah);
+        if ((tsf & 0x7fff) < rstamp)
+                tsf -= 0x8000;
+        return ((tsf &~ 0x7fff) | rstamp);
+}
+
+/*
- * Add a prism2 header to a received frame and
- * dispatch it to capture tools like kismet.
- */
@@ -5204 +5219 @@
-        struct ath_softc *sc = dev->priv;
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ieee80211_frame *wh;
-32
+64
-
-        /* Pass up tsf clock in mactime
-         * Rx descriptor has the low 15 bits of the tsf at
-         * the time the frame was received.  Use the current
-32
+64
-         */
-
-
-
-
+
-
-        KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
-                ("data padding not enabled?"));
@@ -5245 +5257 @@
-        struct ieee80211_frame *wh;
-        int extra = A_MAX(sizeof(struct ath_tx_radiotap_header), 
-                          A_MAX(sizeof(wlan_ng_prism2_header), ATHDESC_HEADER_SIZE));
+        u_int64_t tsf;
+
+        /* Pass up tsf clock in mactime
+         * tx descriptor has the low 15 bits of the tsf at
+         * the time the frame was received.  Use the current
+         * tsf to extend this to 64 bits.
+         */
+        tsf = ath_extend_tsf(sc->sc_ah, ds->ds_txstat.ts_tstamp);
+
-        /*                                                                      
-         * release the owner of this skb since we're basically                  
-         * recycling it                                                         
@@ -5278 +5299 @@
-                printk("%s:%d %s\n", __FILE__, __LINE__, __func__);
-                goto done;
-        }
-0
+tsf
- done:
-        dev_kfree_skb(skb);
-}
-
-/*
- * Extend 15-bit time stamp from rx descriptor to
- * a full 64-bit TSF using the current h/w TSF.
- */
-static __inline u_int64_t
-ath_extend_tsf(struct ath_hal *ah, u_int32_t rstamp)
-{
-        u_int64_t tsf;
-
-        tsf = ath_hal_gettsf64(ah);
-        if ((tsf & 0x7fff) < rstamp)
-                tsf -= 0x8000;
-        return ((tsf &~ 0x7fff) | rstamp);
-}
-
-/*
- * Intercept management frames to collect beacon rssi data
- * and to do ibss merges.
- */