ath9k: merge a few more cleanups/fixes