ath5k,ath9k: merge minor fixes from r27432, r27433