mac80211: merge a few pending fixes for channel switch handling