Ticket #1397: tsf-per-packet.diff

net80211/ieee80211_scan.c

@@ -831 +831 @@
-ieee80211_add_scan(struct ieee80211vap *vap,
-        const struct ieee80211_scanparams *sp,
-        const struct ieee80211_frame *wh,
-in
+u_int64_
-{
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_scan_state *ss = ic->ic_scan;

net80211/ieee80211_node.c

@@ -1601 +1601 @@
-                       ni->ni_rxseqs[i] >> IEEE80211_SEQ_SEQ_SHIFT,
-                       ni->ni_rxseqs[i] & IEEE80211_SEQ_FRAG_MASK);
-        }
-
+10ll
-                ni->ni_rstamp, ni->ni_rssi, ni->ni_intval, ni->ni_capinfo);
-        printf("\tbssid %s essid \"%.*s\" channel %u:0x%x\n",
-                ether_sprintf(ni->ni_bssid),

net80211/ieee80211_scan.h

@@ -100 +100 @@
-
-struct ieee80211_scanparams;
-void ieee80211_add_scan(struct ieee80211vap *, const struct ieee80211_scanparams *,
-in
+u_int64_
-void ieee80211_scan_timeout(struct ieee80211com *);
-
-void ieee80211_scan_assoc_success(struct ieee80211com *,
@@ -156 +156 @@
-        u_int8_t se_ssid[2 + IEEE80211_NWID_LEN];
-        u_int8_t se_rates[2 + IEEE80211_RATE_MAXSIZE];
-        u_int8_t se_xrates[2 + IEEE80211_RATE_MAXSIZE];
-32
+64
-        union {
-                u_int8_t data[8];
-                __le64 tsf;
@@ -196 +196 @@
-        /* add an entry to the cache */
-        int (*scan_add)(struct ieee80211_scan_state *,
-                const struct ieee80211_scanparams *,
-in
+u_int64_
-        /* age and/or purge entries in the cache */
-        void (*scan_age)(struct ieee80211_scan_state *);
-        /* note that association failed for an entry */

net80211/ieee80211_node.h

@@ -136 +136 @@
-        int ni_rxkeyoff;                        /* Receive key offset */
-
-        /* hardware */
-32
+64
-        u_int32_t ni_last_rx;                   /* recv jiffies */
-        u_int8_t ni_rssi;                       /* recv ssi */
-

net80211/ieee80211_scan_sta.c

@@ -215 +215 @@
- */
-static int
-sta_add(struct ieee80211_scan_state *ss, const struct ieee80211_scanparams *sp,
-in
+u_int64_
-{
-#define ISPROBE(_st)    ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP)
-#define PICK1ST(_ss) \

net80211/ieee80211_wireless.c

@@ -1064 +1064 @@
-                for (i = 0; i < number; i++)
-                        memcpy(&vap->iv_spy.mac[i * IEEE80211_ADDR_LEN],
-                                address[i].sa_data, IEEE80211_ADDR_LEN);
-
-IW_MAX_SPY * sizeof(u_int32_t
+to 0 
+sizeof(vap->iv_spy.ts_rssi
-        }
-        vap->iv_spy.num = number;
-

net80211/ieee80211_input.c

@@ -193 +193 @@
- */
-int
-ieee80211_input(struct ieee80211_node *ni,
-32
+64
-{
-#define HAS_SEQ(type)   ((type & 0x4) == 0)
-        struct ieee80211vap *vap = ni->ni_vap;
@@ -894 +894 @@
- */
-int
-ieee80211_input_all(struct ieee80211com *ic,
-32
+64
-{
-        struct ieee80211vap *vap;
-        int type = -1;
@@ -1229 +1229 @@
-
-static void
-ieee80211_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh,
-32
+64
-{
-        struct ieee80211vap *vap = ni->ni_vap;
-        unsigned int tmpnode = 0;
@@ -1372 +1372 @@
-/* XXX TODO: add statistics */
-static void
-ieee80211_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh,
-32
+64
-        u_int16_t seq, u_int16_t status)
-{
-        struct ieee80211vap *vap = ni->ni_vap;
@@ -2530 +2530 @@
- */
-void
-ieee80211_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb,
-32
+64
-{
-#define ISPROBE(_st)    ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP)
-#define ISREASSOC(_st)  ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP)

net80211/ieee80211_scan_ap.c

@@ -250 +250 @@
- */
-static int
-ap_add(struct ieee80211_scan_state *ss, const struct ieee80211_scanparams *sp,
-in
+u_int64_
-{
-        struct ap_state *as = ss->ss_priv;
-        struct ieee80211vap *vap = ss->ss_vap;

net80211/ieee80211_var.h

@@ -131 +131 @@
-#define IW_MAX_SPY 8
-struct ieee80211_spy {
-        u_int8_t mac[IW_MAX_SPY * IEEE80211_ADDR_LEN];
-32
+64
-        u_int8_t thr_low;                       /* 1 byte rssi value, 0 = threshold is off */
-        u_int8_t thr_high;                      /* 1 byte rssi value */
-        u_int8_t num;
@@ -361 +361 @@
-        /* Send/recv 802.11 management frame */
-        int (*ic_send_mgmt)(struct ieee80211_node *, int, int);
-        void (*ic_recv_mgmt)(struct ieee80211_node *, struct sk_buff *, int,
-32
+64
-
-        /* Send management frame to driver (like hardstart) */
-        int (*ic_mgtstart)(struct ieee80211com *, struct sk_buff *);

net80211/ieee80211_proto.h

@@ -63 +63 @@
-
-struct ieee80211_node;
-struct ieee80211_channel *ieee80211_doth_findchan(struct ieee80211vap *, u_int8_t);
-32
-32
+64
+64
-int ieee80211_setup_rates(struct ieee80211_node *, const u_int8_t *,
-        const u_int8_t *, int);
-void ieee80211_saveie(u_int8_t **, const u_int8_t *);
-void ieee80211_saveath(struct ieee80211_node *, u_int8_t *);
-void ieee80211_recv_mgmt(struct ieee80211_node *, struct sk_buff *,
-32
+64
-void ieee80211_sta_pwrsave(struct ieee80211vap *, int);
-int ieee80211_hardstart(struct sk_buff *, struct net_device *);
-void ieee80211_parent_queue_xmit(struct sk_buff *);

ath/if_athvar.h

@@ -392 +392 @@
-        struct ieee80211_node *bf_node;                 /* pointer to the node */
-        u_int32_t bf_status;                            /* status flags */
-        u_int16_t bf_flags;                             /* tx descriptor flags */
+        u_int64_t bf_tsf;
-#ifdef ATH_SUPERG_FF
-        /* XXX: combine this with bf_skbaddr if it ever changes to accommodate
-         *      multiple segments.
@@ -531 +532 @@
-        struct ath_stats sc_stats;              /* private statistics */
-        int devid;
-        int sc_debug;
-32
+64
-        void (*sc_node_cleanup)(struct ieee80211_node *);
-        void (*sc_node_free)(struct ieee80211_node *);
-        void *sc_bdev;                          /* associated bus device */

ath/if_ath.c

@@ -167 +167 @@
-static u_int8_t ath_node_getrssi(const struct ieee80211_node *);
-static int ath_rxbuf_init(struct ath_softc *, struct ath_buf *);
-static void ath_recv_mgmt(struct ieee80211_node *, struct sk_buff *, int,
-32
+64
-static void ath_setdefantenna(struct ath_softc *, u_int);
-static struct ath_txq *ath_txq_setup(struct ath_softc *, int, int);
-static void ath_rx_tasklet(TQUEUE_ARG);
@@ -1433 +1433 @@
-                if (HAL_EINPROGRESS == retval)
-                        break;
-
+                /* update the per packet TSF with sc_tsf, sc_tsf is updated on
+                   each RX interrupt. */
+                bf->bf_tsf = sc->sc_tsf;
+
-                /* XXX: We do not support frames spanning multiple descriptors */
-                bf->bf_status |= ATH_BUFSTATUS_DONE;
-
@@ -5331 +5335 @@
-         * tsf to extend this to 64 bits.
-         */
-        /* NB: Not all chipsets return the same precision rstamp */
-sc->sc
+bf->bf
-
-        KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
-                ("data padding not enabled?"));
@@ -5422 +5426 @@
- */
-static void
-ath_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb,
-32
+64
-{
-        struct ath_softc *sc = ni->ni_ic->ic_dev->priv;
-        struct ieee80211vap *vap = ni->ni_vap;
@@ -5449 +5453 @@
-        case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-                if (vap->iv_opmode == IEEE80211_M_IBSS &&
-                    vap->iv_state == IEEE80211_S_RUN) {
-                        u_int64_t tsf = ath_extend_tsf(sc->sc_tsf, rstamp);
-                        /*
-                         * Handle ibss merge as needed; check the tsf on the
-                         * frame before attempting the merge.  The 802.11 spec
@@ -5463 +5466 @@
-                        /* jal: added: don't merge if we have a desired
-                           BSSID */
-                        if (!(vap->iv_flags & IEEE80211_F_DESBSSID) &&
-tsf
+rstamp
-                                DPRINTF(sc, ATH_DEBUG_STATE,
-rstamp %u tsf %llu "
-"tstamp %llu\n", rstamp, (unsigned long long) tsf
+tsf %10llu tstamp %10llu\n",
+rstamp
-                                        (unsigned long long) le64_to_cpu(ni->ni_tstamp.tsf));
-                                (void) ieee80211_ibss_merge(ni);
-                        }
@@ -5506 +5509 @@
-        unsigned int len;
-        int type;
-        u_int phyerr;
+        u_int64_t rs_tsf;
-
-        /* Let the 802.11 layer know about the new noise floor */
-        sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
@@ -5699 +5703 @@
-                                   sc->sc_hwmap[rs->rs_rate].ieeerate,
-                                   rs->rs_rssi);
-
+                rs_tsf = ath_extend_tsf(bf->bf_tsf, rs->rs_tstamp);
+
-                /*
-                 * Locate the node for sender, track state, and then
-                 * pass the (referenced) node up to the 802.11 layer
@@ -5714 +5720 @@
-                         */
-                        an = ATH_NODE(ieee80211_ref_node(ni));
-                        ATH_RSSI_LPF(an->an_avgrssi, rs->rs_rssi);
-->rs_tstamp
+_tsf
-                        ieee80211_unref_node(&ni);
-                } else {
-                        /*
@@ -5728 +5734 @@
-                                ieee80211_keyix_t keyix;
-
-                                ATH_RSSI_LPF(an->an_avgrssi, rs->rs_rssi);
-->rs_tstamp
+_tsf
-                                /*
-                                 * If the station has a key cache slot assigned
-                                 * update the key->node mapping table.
@@ -5739 +5745 @@
-                                        sc->sc_keyixmap[keyix] = ieee80211_ref_node(ni);
-                                ieee80211_unref_node(&ni);
-                        } else
-
-
+
-                }
-
-                if (sc->sc_diversity) {