mac80211: merge a client mode state handling fix, refresh patches