On 21 October 2014 10:17, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Michal Kazior <michal.kazior@xxxxxxxxx> writes: > >> In some cases hw recovery was taking an absurdly >> long time due to ath10k waiting for things that >> would never really complete. >> >> Instead of waiting for inevitable timeouts poke >> all completions and wakequeues and check if it's >> still worth waiting. >> >> Reading/writing ar->state requires conf_mutex. >> Since waiters might be holding it introduce a new >> flag CRASH_FLUSH so it's possible to tell waiters >> to abort whatever they were waiting for. >> >> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> > > While applying to ath-next-test there was a conflict in core.h. Please > check my resolution: > > https://github.com/kvalo/ath/commit/6cccda0185c7df96f439dc3f87961e81843de3ee I think it was `enum ath10k_cal_mode {` vs `enum ath10k_scan_state {` because my patch was based without your cal patches. Anyway - looks good, thanks! Michał -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html