mac80211, ath9k: merge some pending fixes from linux-wireless@