ath9k: merge an aggregation related fix