ath9k: merge some aggregation / rate handling related fixes