diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-10-07 01:39:38 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-10-07 01:39:38 +0000 |
| commit | e9fd938246ca0276c6424c0b01ff7ead972be675 (patch) | |
| tree | 3d2393a9c3b145fa5eb7b78bc7a6cff558051d80 /package/madwifi/patches/375-atim_tsf_update.patch | |
| parent | dc1f0c32c7fc544b6b18a2235fd152c4dc6d693a (diff) | |
madwifi: allow ad-hoc mode with software based TSF merging (hardware merging can screw up the internal timers and cause transmit hangs) - based on a patch by sven-ola. activated by wlanconfig's nosbeacon flag
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12883 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/375-atim_tsf_update.patch')
| -rw-r--r-- | package/madwifi/patches/375-atim_tsf_update.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/madwifi/patches/375-atim_tsf_update.patch b/package/madwifi/patches/375-atim_tsf_update.patch index a8a05e03a..534986bbb 100644 --- a/package/madwifi/patches/375-atim_tsf_update.patch +++ b/package/madwifi/patches/375-atim_tsf_update.patch @@ -8,7 +8,7 @@ static int ath_desc_alloc(struct ath_softc *); static void ath_desc_free(struct ath_softc *); static void ath_desc_swap(struct ath_desc *); -@@ -2783,6 +2784,72 @@ +@@ -2793,6 +2794,72 @@ return 1; } @@ -81,7 +81,7 @@ /* * Reset the hardware w/o losing operational state. This is * basically a more efficient way of doing ath_stop, ath_init, -@@ -5282,6 +5349,7 @@ +@@ -5292,6 +5359,7 @@ u_int64_t tsf, hw_tsf; u_int32_t tsftu, hw_tsftu; u_int32_t intval, nexttbtt = 0; @@ -89,7 +89,7 @@ int reset_tsf = 0; if (vap == NULL) -@@ -5289,6 +5357,9 @@ +@@ -5299,6 +5367,9 @@ ni = vap->iv_bss; @@ -99,7 +99,7 @@ hw_tsf = ath_hal_gettsf64(ah); tsf = le64_to_cpu(ni->ni_tstamp.tsf); hw_tsftu = hw_tsf >> 10; -@@ -5478,15 +5549,27 @@ +@@ -5488,15 +5559,27 @@ <= ath_hal_sw_beacon_response_time) nexttbtt += intval; sc->sc_nexttbtt = nexttbtt; @@ -115,7 +115,7 @@ sc->sc_bmisscount = 0; ath_hal_intrset(ah, sc->sc_imask); + -+ if (ath_hw_check_atim(sc, 1, intval & HAL_BEACON_PERIOD)) { ++ if ((sc->sc_opmode == HAL_M_IBSS) && ath_hw_check_atim(sc, 1, intval & HAL_BEACON_PERIOD)) { + DPRINTF(sc, ATH_DEBUG_BEACON, + "fixed atim window after beacon init\n"); + } @@ -127,11 +127,11 @@ /* We print all debug messages here, in order to preserve the * time critical aspect of this function */ DPRINTF(sc, ATH_DEBUG_BEACON, -@@ -6389,6 +6472,11 @@ +@@ -6399,6 +6482,11 @@ DPRINTF(sc, ATH_DEBUG_BEACON, "Updated beacon timers\n"); } -+ if ((sc->sc_opmode == IEEE80211_M_IBSS) && ++ if ((sc->sc_opmode == HAL_M_IBSS) && + IEEE80211_ADDR_EQ(ni->ni_bssid, vap->iv_bss->ni_bssid) && + ath_hw_check_atim(sc, 1, vap->iv_bss->ni_intval)) { + DPRINTF(sc, ATH_DEBUG_ANY, "Fixed ATIM window after beacon recv\n"); |