Changeset 3638

Timestamp:

05/16/08 23:21:53 (3 months ago)

Author:

benoit

Message:

First attempt to solve some IBSS merge problems. This code needs further
testing in order to know when to start/stop beacons properly. Preliminary
testing are OK.

Files:

• madwifi/branches/madwifi-dfs/ath/if_ath.c (modified) (9 diffs)
• madwifi/branches/madwifi-dfs/ath/if_athvar.h (modified) (1 diff)

madwifi/branches/madwifi-dfs/ath/if_ath.c

@@ -554 +554 @@
-}
-
+/* Context: Timer (softIRQ) */
+static void
+ath_swba_watchdog(unsigned long data )
+{
+        struct ath_softc * sc = (struct ath_softc *)data;
+
+        DPRINTF(sc, ATH_DEBUG_BEACON,
+                "%s called, configuring beacon\n",__func__);
+        if (sc->sc_beacons)
+                ath_beacon_config(sc, NULL);
+}
+
-/* Initialize ath_softc structure */
-
@@ -760 +772 @@
-                goto bad2;
-        }
+
+        /* SWBA watchdog timer : this timer is needed in order to make sure
+         * that beacon timers are still alive. If they are not, for instance
+         * following an IBSS merge where TSF has been updated and beacon timers
+         * are now in the past, this timer callback will kick in. It might
+         * solve other situations where beacons stops being sent for some
+         * reason */
+        init_timer(&sc->sc_swba_timer);
+        sc->sc_swba_timer.function = ath_swba_watchdog;
+        sc->sc_swba_timer.data     = (unsigned long) sc;
+
-        /* CAB: Crap After Beacon - a beacon gated queue */
-        sc->sc_cabq = ath_txq_setup(sc, HAL_TX_QUEUE_CAB, 0);
@@ -1313 +1336 @@
-        now_tu   = IEEE80211_TSF_TO_TU(ath_hal_gettsf64(ah));
-        nexttbtt = sc->sc_nexttbtt + roundup_s(
-
-
+
-
-        if (nexttbtt != sc->sc_nexttbtt) {
@@ -2606 +2628 @@
-                if (status & HAL_INT_SWBA) {
-                        struct ieee80211vap * vap;
+                        u_int32_t hw_tsftu = IEEE80211_TSF_TO_TU(hw_tsf);
-
-                        DPRINTF(sc, ATH_DEBUG_BEACON,
@@ -2611 +2634 @@
-                                "tsf %10llx tsf_tu:%6u nexttbtt %10llx "
-                                "nexttbtt_tu:%6u\n",
-IEEE80211_TSF_TO_TU(hw_tsf)
+hw_tsftu
-                                (u_int64_t)sc->sc_nexttbtt << 10,
-                                sc->sc_nexttbtt);
@@ -2630 +2653 @@
-                        vap = TAILQ_FIRST(&sc->sc_ic.ic_vaps);
-                        sc->sc_nexttbtt += vap->iv_bss->ni_intval;
+
+                        /* Updates SWBA watchdog timer */
+                        mod_timer(&sc->sc_swba_timer, jiffies
+                                  + IEEE80211_TU_TO_JIFFIES(
+                                          sc->sc_nexttbtt - hw_tsftu));
+
-                }
-                if (status & HAL_INT_RXEOL) {
@@ -5703 +5732 @@
-                 * zero, so next beacon will be sent at the next intval
-                 * time */
+                hw_tsf   = 0;
+                hw_tsftu = 0;
-                nexttbtt = intval;
-        } else if (intval) {    /* NB: can be 0 for monitor mode */
@@ -5721 +5752 @@
-                                 * We cannot use the hardware TSF, so we
-                                 * wait to synchronize beacons again. */
+                                nexttbtt = roundup(hw_tsftu + FUDGE, intval);
-                                sc->sc_syncbeacon = 1;
-                                goto ath_beacon_config_debug;
-                        } else {
-                                /* Normal case: we received a beacon to which
-
-
-
-
+
+
+
+
+
-                        }
-                }
@@ -5854 +5886 @@
-                sc->sc_nexttbtt = nexttbtt;
-                ath_hw_beaconinit(sc, hw_tsftu, nexttbtt, intval);
-intval & HAL_BEACON_RESET_TSF) {
+reset_tsf)
-                        sc->sc_last_tsf = 0;
-                }
-                sc->sc_bmisscount = 0;
-                ath_hal_intrset(ah, sc->sc_imask);
-
-
-
+
+
+
+
+
+
+
-        /* We print all debug messages here, in order to preserve the
-         * time critical aspect of this function */

madwifi/branches/madwifi-dfs/ath/if_athvar.h

@@ -740 +740 @@
-        int sc_bhalq;                           /* HAL q for outgoing beacons */
-        u_int sc_bmisscount;                    /* missed beacon transmits */
+        struct timer_list sc_swba_timer;        /* watchdog timer for SWBA */
-        u_int32_t sc_ant_tx[8];                 /* recent tx frames/antenna */
-        struct ath_txq *sc_cabq;                /* tx q for cab frames */