Ticket #1033: ibss_beacon_nexttbtt_fix.diff

ath/if_ath.c

@@ -4426 +4426 @@
-{
-#define TSF_TO_TU(_h,_l) \
-        ((((u_int32_t)(_h)) << 22) | (((u_int32_t)(_l)) >> 10))
+#define FUDGE   2
-        struct ieee80211com *ic = &sc->sc_ic;
-        struct ath_hal *ah = sc->sc_ah;
-        struct ieee80211_node *ni;
@@ -4481 +4482 @@
-                        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.
@@ -4496 +4496 @@
-                                        cfpcount = cfpperiod - 1;
-                        }
-                } while (nexttbtt < tsftu);
-#undef FUDGE
-                memset(&bs, 0, sizeof(bs));
-                bs.bs_intval = intval;
-                bs.bs_nexttbtt = nexttbtt;
@@ -4579 +4578 @@
-                        intval |= HAL_BEACON_ENA;
-                        if (!sc->sc_hasveol)
-                                sc->sc_imask |= HAL_INT_SWBA;
+                        if ((intval & HAL_BEACON_RESET_TSF) == 0) {
+                                u_int64_t tsf;
+                                u_int32_t clintval, tsftu;
+                                /*
+                                 * Pull nexttbtt forward to reflect
+                                 * the current TSF.
+                                 */
+                                clintval = intval & HAL_BEACON_PERIOD;
+                                tsf = ath_hal_gettsf64(ah);
+                                tsftu = TSF_TO_TU(tsf>>32, tsf);
+                                if (tsftu < nexttbtt)
+                                        tsftu = nexttbtt;
+                                tsftu += clintval + FUDGE;
+                                do {
+                                        nexttbtt += clintval;
+                                } while (nexttbtt < tsftu);
+                        }
-                        ath_beaconq_config(sc);
-                } else if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
-                        /*
@@ -4605 +4621 @@
-        }
-        sc->sc_syncbeacon = 0;
-#undef TSF_TO_TU
+#undef FUDGE
-}
-
-static int