ath9k: merge a few upstream fixes