Ticket #1033: adhoc-beacon-5.diff

ath/if_ath.c

@@ -4416 +4416 @@
-        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;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /* XXX conditionalize multi-bss support? */
-        if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
-                /*
@@ -4439 +4454 @@
-                if (sc->sc_stagbeacons)
-                        intval /= ATH_BCBUF;    /* for staggered beacons */
-                if ((sc->sc_nostabeacons) &&
-    
-nexttbtt = 0
+       
+should_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;
-
@@ -4468 +4524 @@
-                        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) {
@@ -4482 +4538 @@
-                                if (--cfpcount < 0)
-                                        cfpcount = cfpperiod - 1;
-                        }
-tsftu
+hw_tsftu + FUDGE
-#undef FUDGE
-                memset(&bs, 0, sizeof(bs));
-                bs.bs_intval = intval;
@@ -4534 +4590 @@
-                DPRINTF(sc, ATH_DEBUG_BEACON, 
-                        "%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n",
-                        __func__,
-tsf, 
+hw_tsf, hw_
-                        bs.bs_intval,
-                        bs.bs_nexttbtt,
-                        bs.bs_dtimperiod,
@@ -4553 +4609 @@
-                ath_hal_intrset(ah, sc->sc_imask);
-        } else {
-                ath_hal_intrset(ah, 0);
-nexttbtt == intval
+should_reset_tsf
-                        intval |= HAL_BEACON_RESET_TSF;
-                if (ic->ic_opmode == IEEE80211_M_IBSS) {
-                        /*
@@ -4590 +4646 @@
-                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 (should_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