Changeset 39150


Ignore:
Timestamp:
2013-12-20T17:02:32+01:00 (4 years ago)
Author:
nbd
Message:

ath9k: merge a timer handling fixes

Signed-off-by: Felix Fietkau <nbd@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/patches/300-pending_work.patch

    r39138 r39150  
    22782278+       tsf = ath9k_hw_gettsf64(ah); 
    22792279+       getrawmonotonic(&ts); 
    2280 +       usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000; 
     2280+       usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000; 
    22812281  
    22822282        saveLedState = REG_READ(ah, AR_CFG_LED) & 
     
    22892289-               ath9k_hw_settsf64(ah, tsf); 
    22902290+       getrawmonotonic(&ts); 
    2291 +       usec = ts.tv_sec * 1000 + ts.tv_nsec / 1000 - usec; 
     2291+       usec = ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000 - usec; 
    22922292+       ath9k_hw_settsf64(ah, tsf + usec); 
    22932293  
     
    23972397- 
    23982398-       set_bit(timer->index, &timer_table->timer_mask.timer_bits); 
     2399- 
     2400-       tsf = ath9k_hw_gettsf32(ah); 
    23992401+       u32 mask = 0; 
    24002402  
    2401 -       tsf = ath9k_hw_gettsf32(ah); 
    2402 - 
    24032403-       timer_next = tsf + trig_timeout; 
    24042404- 
     
    24772477+       thresh_mask &= timer_table->timer_mask; 
    24782478  
    2479         trigger_mask &= ~thresh_mask; 
    2480   
     2479-       trigger_mask &= ~thresh_mask; 
     2480- 
    24812481-       while (thresh_mask) { 
    24822482-               index = rightmost_index(timer_table, &thresh_mask); 
     
    24902490+               if (!timer->overflow) 
    24912491+                   continue; 
     2492+ 
     2493+               trigger_mask &= ~BIT(index); 
    24922494                timer->overflow(timer->arg); 
    24932495        } 
Note: See TracChangeset for help on using the changeset viewer.