mac80211: merge a series of cleanups/fixes