ath9k: merge a timer handling fixes