hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k: merge a timer handling fixes 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39150
owl
Felix Fietkau 2013-12-20 16:02:32 +00:00
parent f2cd3399f7
commit 41cbd0a389
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/kernel/mac80211/patches/300-pending_work.patch
View File

@ -2277,7 +2277,7 @@
+ /* Save TSF before chip reset, a cold reset clears it */ + /* Save TSF before chip reset, a cold reset clears it */
+ tsf = ath9k_hw_gettsf64(ah); + tsf = ath9k_hw_gettsf64(ah);
+ getrawmonotonic(&ts); + getrawmonotonic(&ts);
+ usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000; + usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000;
saveLedState = REG_READ(ah, AR_CFG_LED) & saveLedState = REG_READ(ah, AR_CFG_LED) &
(AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL | (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
@ -2288,7 +2288,7 @@
- if (tsf) - if (tsf)
- ath9k_hw_settsf64(ah, tsf); - ath9k_hw_settsf64(ah, tsf);
+ getrawmonotonic(&ts); + getrawmonotonic(&ts);
+ usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec; + usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000 - usec;
+ ath9k_hw_settsf64(ah, tsf + usec); + ath9k_hw_settsf64(ah, tsf + usec);
if (AR_SREV_9280_20_OR_LATER(ah)) if (AR_SREV_9280_20_OR_LATER(ah))
@ -2396,10 +2396,10 @@
- BUG_ON(!timer_period); - BUG_ON(!timer_period);
- -
- set_bit(timer->index, &timer_table->timer_mask.timer_bits); - set_bit(timer->index, &timer_table->timer_mask.timer_bits);
-
- tsf = ath9k_hw_gettsf32(ah);
+ u32 mask = 0; + u32 mask = 0;
- tsf = ath9k_hw_gettsf32(ah);
-
- timer_next = tsf + trig_timeout; - timer_next = tsf + trig_timeout;
- -
- ath_dbg(ath9k_hw_common(ah), BTCOEX, - ath_dbg(ath9k_hw_common(ah), BTCOEX,
@ -2476,8 +2476,8 @@
+ trigger_mask &= timer_table->timer_mask; + trigger_mask &= timer_table->timer_mask;
+ thresh_mask &= timer_table->timer_mask; + thresh_mask &= timer_table->timer_mask;
trigger_mask &= ~thresh_mask; - trigger_mask &= ~thresh_mask;
-
- while (thresh_mask) { - while (thresh_mask) {
- index = rightmost_index(timer_table, &thresh_mask); - index = rightmost_index(timer_table, &thresh_mask);
+ for_each_set_bit(index, &thresh_mask, ARRAY_SIZE(timer_table->timers)) { + for_each_set_bit(index, &thresh_mask, ARRAY_SIZE(timer_table->timers)) {
@ -2489,6 +2489,8 @@
+ continue; + continue;
+ if (!timer->overflow) + if (!timer->overflow)
+ continue; + continue;
+
+ trigger_mask &= ~BIT(index);
timer->overflow(timer->arg); timer->overflow(timer->arg);
} }