ath9k: merge a few fixes from trunk