Ticket #1033: madwifi-ibss-merge-clean.3.diff

net80211/ieee80211_node.c

@@ -517 +517 @@
-        struct ieee80211com *ic = ni->ni_ic;
-#endif
-
-
-
+
-                /* unchanged, nothing to do */
-                return 0;
-        }
@@ -1188 +1187 @@
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_node *ni;
-
-1
+0
-        if (ni != NULL) {
-                ni->ni_esslen = sp->ssid[1];
-                memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);

net80211/ieee80211_linux.c

@@ -360 +360 @@
-
-        IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
-        TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
+                struct timespec t;
+                
-                /* Assume each node needs 500 bytes */
-                if (buf + space < p + 500)
-                        break;
-
-
-
-
+
+
-                        jiffies_to_timespec(jiffies - ni->ni_last_rx, &t);
-
+
+
+
-                        p += sprintf(p, " rssi %d\n", ni->ni_rssi);
-
-                        p += sprintf(p, " last_rx %ld.%06ld\n",
-                                     t.tv_sec, t.tv_nsec / 1000);
-
+
+
-                }
-        }
-        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
+
-        return (p - buf);
-}
-

ath/if_ath.c

@@ -4416 +4416 @@
- * the beacon miss handling so we'll receive a BMISS
- * interrupt when we stop seeing beacons from the AP
- * we've associated with.
+ *
+ * Note : TBTT is Target Beacon Transmission Time (see IEEE 
+ * 802.11-1999: 4 & 11.2.1.3).
- */
-static void
-ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
@@ -4425 +4428 @@
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ath_hal *ah = sc->sc_ah;
-        struct ieee80211_node *ni;
-
+
+
+
+
+
-
-        if (vap == NULL)
-                vap = TAILQ_FIRST(&ic->ic_vaps);   /* XXX */
-
-        ni = vap->iv_bss;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
-
-
+
-                 * evenly over N slots or burst together.  For the former
-                 * arrange for the SWBA to be delivered for each slot.
-
-
+
-                /* NB: the beacon interval is kept internally in TUs */
-                intval = ic->ic_lintval & HAL_BEACON_PERIOD;
-                if (sc->sc_stagbeacons)
-                        intval /= ATH_BCBUF;    /* for staggered beacons */
-                if ((sc->sc_nostabeacons) &&
-    
-nexttbtt = 0
+       
+reset_tsf = 1
-        } else
-                intval = ni->ni_intval & HAL_BEACON_PERIOD;
-
+
+
+
+
+
+
+
+
-                nexttbtt = intval;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (ic->ic_opmode == IEEE80211_M_STA && !(sc->sc_nostabeacons)) {
-                HAL_BEACON_STATE bs;
-                u_int64_t tsf;
-                u_int32_t tsftu;
-                int dtimperiod, dtimcount;
-                int cfpperiod, cfpcount;
-
-
-
-
-
+
+
-                dtimperiod = vap->iv_dtim_period;
-                if (dtimperiod <= 0)            /* NB: 0 if not known */
-                        dtimperiod = 1;
@@ -4477 +4518 @@
-                        dtimcount = 0;          /* XXX? */
-                cfpperiod = 1;                  /* NB: no PCF support yet */
-                cfpcount = 0;
-#define FUDGE   2
-                /*
-                 * Pull nexttbtt forward to reflect the current
-                 * TSF and calculate dtim+cfp state for the result.
-                 */
-
-
+
+
+
-                do {
-                        nexttbtt += intval;
-                        if (--dtimcount < 0) {
@@ -4491 +4532 @@
-                                if (--cfpcount < 0)
-                                        cfpcount = cfpperiod - 1;
-                        }
-tsftu
+hw_tsftu + FUDGE
-#undef FUDGE
-                memset(&bs, 0, sizeof(bs));
-                bs.bs_intval = intval;
@@ -4565 +4606 @@
-                ath_hal_intrset(ah, sc->sc_imask);
-        } else {
-                ath_hal_intrset(ah, 0);
-nexttbtt == intval
+reset_tsf
-                        intval |= HAL_BEACON_RESET_TSF;
-                if (ic->ic_opmode == IEEE80211_M_IBSS) {
-                        /*
@@ -4602 +4643 @@
-                if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
-                        ath_beacon_start_adhoc(sc, vap);
-        }
-        sc->sc_syncbeacon = 0;
-#undef TSF_TO_TU
+
+        ath_beacon_config_debug:
+        /* We print all debug messages here, in order to preserve the
+         * time critical aspect of this function */
+        DPRINTF(sc, ATH_DEBUG_BEACON,
+                "%s: ni=%p tsf=%llu hw_tsf=%llu tsftu=%u hw_tsftu=%u\n",
+                __func__, ni, tsf, hw_tsf, tsftu, hw_tsftu);
+
+        if (reset_tsf)
+                /* We just created the interface */
+                DPRINTF(sc, ATH_DEBUG_BEACON, "%s: first beacon\n", __func__);
+        else if (tsf == 1)
+                /* We do not receive any beacons or probe response */
+                DPRINTF(sc, ATH_DEBUG_BEACON,
+                                "%s: no beacon received...\n",__func__);
+        else if (tsf > hw_tsf)
+                /* We do receive a beacon and the hw TSF has not been updated */
+                DPRINTF(sc, ATH_DEBUG_BEACON,
+                                "%s: beacon received, but TSF is incorrect\n", 
+                                __func__);
+        else
+                /* We do receive a beacon in the past, normal case */
+                DPRINTF(sc, ATH_DEBUG_BEACON,
+                                "%s: beacon received, TSF is correct\n", 
+                                __func__);
+
+        DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt=%u intval=%u\n",
+                __func__, nexttbtt, intval & HAL_BEACON_PERIOD);
-}
-
-static int
@@ -5446 +5514 @@
-        struct ath_softc *sc = ni->ni_ic->ic_dev->priv;
-        struct ieee80211vap *vap = ni->ni_vap;
-
-
-
-
-
+
+
-        sc->sc_recv_mgmt(ni, skb, subtype, rssi, rtsf);
-        switch (subtype) {
-        case IEEE80211_FC0_SUBTYPE_BEACON:
-update rssi
+Update RSSI
-                ATH_RSSI_LPF(ATH_NODE(ni)->an_halstats.ns_avgbrssi, rssi);
-                if ((sc->sc_syncbeacon || (vap->iv_flags_ext & IEEE80211_FEXT_APPIE_UPDATE)) &&
-                    ni == vap->iv_bss && vap->iv_state == IEEE80211_S_RUN) {
-
-
-
-
+
+
-                        vap->iv_flags_ext &= ~IEEE80211_FEXT_APPIE_UPDATE;
-                        ath_beacon_config(sc, vap);
-                }
-fall thru...
+NB: Fall Through
-        case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-                if (vap->iv_opmode == IEEE80211_M_IBSS &&
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                         * frame before attempting the merge.  The 802.11 spec
-                         * says the station should change its BSSID to match
-                         * the oldest station with the same SSID, where oldest
-                         * is determined by the TSF.  Note that hardware
-                         * reconfiguration happens through callback to
-                         * ath_newstate as the state machine will go from
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
-                break;