mac80211: merge a few ad-hoc mode fixes