Restore some of the BSS synchronization code, but only add the goto that skips the beacon timer updates for IBSS.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3288 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mtaylor 2008-01-28 20:26:25 +00:00
parent a04a25ead0
commit e2ac8356c2
1 changed files with 2 additions and 3 deletions

View File

@ -5143,7 +5143,6 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
* next beacon timestamp again */
nexttbtt = roundup(hw_tsftu + FUDGE, intval);
}
#if 0
else {
if (tsf > hw_tsf) {
/* We received a beacon, but the HW TSF has
@ -5151,7 +5150,8 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
* We cannot use the hardware TSF, so we
* wait to synchronize beacons again. */
sc->sc_syncbeacon = 1;
goto ath_beacon_config_debug;
if (ic->ic_opmode == IEEE80211_M_IBSS)
goto ath_beacon_config_debug;
} else {
/* Normal case: we received a beacon to which
* we have synchronized. Make sure that nexttbtt
@ -5160,7 +5160,6 @@ ath_beacon_config(struct ath_softc *sc, struct ieee80211vap *vap)
tsftu, intval);
}
}
#endif
}
if (ic->ic_opmode == IEEE80211_M_STA && !(sc->sc_nostabeacons)) {