ath9k: merge another round of upstream (or -pending) fixes and cleanups