mac80211: merge a client mode channel switch handling fix