ath9k: merge fixes from r25204, r25205